diff --git a/app/.meteor/packages b/app/.meteor/packages index 6bfb61c4..457d1ae0 100644 --- a/app/.meteor/packages +++ b/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-beta280.7 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 diff --git a/app/.meteor/release b/app/.meteor/release index 66dd7b66..fb8b6663 100644 --- a/app/.meteor/release +++ b/app/.meteor/release @@ -1 +1 @@ -METEOR@2.7.3 +METEOR@2.8-beta.7 diff --git a/app/.meteor/versions b/app/.meteor/versions index dbabbb8b..0a33415a 100644 --- a/app/.meteor/versions +++ b/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 @@ -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-beta280.7 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-js@2.7.4 -minimongo@1.8.0 +minifier-css@1.6.1 +minifier-js@2.7.5 +minimongo@1.9.0-beta280.7 mobile-experience@1.1.0 mobile-status-bar@1.1.0 modern-browsers@0.1.8 -modules@0.18.0 +modules@0.19.0-beta280.7 modules-runtime@0.13.0 -mongo@1.15.0 +mongo@1.16.0-beta280.7 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-beta280.7 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 diff --git a/app/client/head.html b/app/client/head.html index 85ef16df..ba29f029 100644 --- a/app/client/head.html +++ b/app/client/head.html @@ -2,38 +2,38 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + diff --git a/app/imports/api/creature/creatureFolders/CreatureFolders.js b/app/imports/api/creature/creatureFolders/CreatureFolders.js index 56e3fd69..e0e784cc 100644 --- a/app/imports/api/creature/creatureFolders/CreatureFolders.js +++ b/app/imports/api/creature/creatureFolders/CreatureFolders.js @@ -4,25 +4,25 @@ import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js'; let CreatureFolders = new Mongo.Collection('creatureFolders'); let creatureFolderSchema = new SimpleSchema({ - name: { - type: String, - trim: false, - optional: true, + name: { + type: String, + trim: false, + optional: true, max: STORAGE_LIMITS.name, - }, - creatures: { - type: Array, - defaultValue: [], - }, - 'creatures.$': { - type: String, - regEx: SimpleSchema.RegEx.Id, - }, - owner: { - type: String, - regEx: SimpleSchema.RegEx.Id, + }, + creatures: { + type: Array, + defaultValue: [], + }, + 'creatures.$': { + type: String, + regEx: SimpleSchema.RegEx.Id, + }, + owner: { + type: String, + regEx: SimpleSchema.RegEx.Id, index: 1, - }, + }, archived: { type: Boolean, optional: true, diff --git a/app/imports/api/creature/creatureProperties/CreatureProperties.js b/app/imports/api/creature/creatureProperties/CreatureProperties.js index e4cc728e..ff301a79 100644 --- a/app/imports/api/creature/creatureProperties/CreatureProperties.js +++ b/app/imports/api/creature/creatureProperties/CreatureProperties.js @@ -18,23 +18,23 @@ let CreaturePropertySchema = new SimpleSchema({ type: String, optional: true, }, - type: { + type: { type: String, allowedValues: Object.keys(propertySchemasIndex), }, - tags: { - type: Array, - defaultValue: [], + tags: { + type: Array, + defaultValue: [], maxCount: STORAGE_LIMITS.tagCount, - }, - 'tags.$': { - type: String, + }, + 'tags.$': { + type: String, max: STORAGE_LIMITS.tagLength, - }, - disabled: { - type: Boolean, - optional: true, - }, + }, + disabled: { + type: Boolean, + optional: true, + }, icon: { type: storedIconsSchema, optional: true, @@ -93,20 +93,20 @@ const DenormalisedOnlyCreaturePropertySchema = new SimpleSchema({ CreaturePropertySchema.extend(DenormalisedOnlyCreaturePropertySchema); -for (let key in propertySchemasIndex){ - let schema = new SimpleSchema({}); - schema.extend(propertySchemasIndex[key]); - schema.extend(CreaturePropertySchema); +for (let key in propertySchemasIndex) { + let schema = new SimpleSchema({}); + schema.extend(propertySchemasIndex[key]); + schema.extend(CreaturePropertySchema); schema.extend(ColorSchema); - schema.extend(ChildSchema); - schema.extend(SoftRemovableSchema); - CreatureProperties.attachSchema(schema, { - selector: {type: key} - }); + schema.extend(ChildSchema); + schema.extend(SoftRemovableSchema); + CreatureProperties.attachSchema(schema, { + selector: { type: key } + }); } export default CreatureProperties; export { DenormalisedOnlyCreaturePropertySchema, - CreaturePropertySchema, + CreaturePropertySchema, }; diff --git a/app/imports/api/creature/creatureProperties/methods/adjustQuantity.js b/app/imports/api/creature/creatureProperties/methods/adjustQuantity.js index 06ca6459..d08c43bb 100644 --- a/app/imports/api/creature/creatureProperties/methods/adjustQuantity.js +++ b/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 property = CreatureProperties.findOne(_id); let rootCreature = getRootCreatureAncestor(property); - assertEditPermission(rootCreature, this.userId); + 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; diff --git a/app/imports/api/creature/creatureProperties/methods/damageProperty.js b/app/imports/api/creature/creatureProperties/methods/damageProperty.js index d9af78f5..507d82bd 100644 --- a/app/imports/api/creature/creatureProperties/methods/damageProperty.js +++ b/app/imports/api/creature/creatureProperties/methods/damageProperty.js @@ -22,29 +22,37 @@ const damageProperty = new ValidatedMethod({ timeInterval: 5000, }, run({ _id, operation, value }) { - + // Get action context - const prop = CreatureProperties.findOne(_id); + let prop = CreatureProperties.findOne(_id); if (!prop) throw new Meteor.Error( 'Damage property failed', 'Property doesn\'t exist' ); const creatureId = prop.ancestors[0].id; const actionContext = new ActionContext(creatureId, [creatureId], this); - - // Check permissions + + // Check permissions assertEditPermission(actionContext.creature, this.userId); - // Check if property can take damage - let schema = CreatureProperties.simpleSchema(prop); - if (!schema.allowsKey('damage')){ - throw new Meteor.Error( - 'Damage property failed', - `Property of type "${prop.type}" can't be damaged` - ); + // Check if property can take damage + let schema = CreatureProperties.simpleSchema(prop); + if (!schema.allowsKey('damage')) { + throw new Meteor.Error( + 'Damage property failed', + `Property of type "${prop.type}" can't be damaged` + ); } - + + // Replace the prop by its actionContext counterpart if possible + if (prop.variableName) { + const actionContextProp = actionContext.scope[prop.variableName]; + if (actionContextProp?._id === prop._id) { + prop = actionContextProp; + } + } + const result = damagePropertyWork({ prop, operation, value, actionContext }); - + // Insert the log actionContext.writeLog(); return result; @@ -78,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 @@ -94,7 +102,10 @@ export function damagePropertyWork({ prop, operation, value, actionContext }) { }, { selector: prop }); - } else if (operation === 'increment'){ + // 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') { let currentValue = prop.value || 0; let currentDamage = prop.damage || 0; increment = value; @@ -111,6 +122,9 @@ export function damagePropertyWork({ prop, operation, value, actionContext }) { }, { selector: prop }); + // Also write it straight to the prop so that it is updated in the actionContext + prop.damage += increment; + prop.value -= increment; } applyTriggers(actionContext.triggers?.damageProperty?.after, prop, actionContext); diff --git a/app/imports/api/creature/creatureProperties/methods/duplicateProperty.js b/app/imports/api/creature/creatureProperties/methods/duplicateProperty.js index 3e640714..5a8c84fe 100644 --- a/app/imports/api/creature/creatureProperties/methods/duplicateProperty.js +++ b/app/imports/api/creature/creatureProperties/methods/duplicateProperty.js @@ -5,12 +5,12 @@ import CreatureProperties from '/imports/api/creature/creatureProperties/Creatur import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js'; import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js'; import { - setLineageOfDocs, - renewDocIds + setLineageOfDocs, + renewDocIds } 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); @@ -44,17 +44,17 @@ const duplicateProperty = new ValidatedMethod({ // Get all the descendants let nodes = CreatureProperties.find({ - 'ancestors.id': _id, - removed: {$ne: true}, - }, { + 'ancestors.id': _id, + 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`, }); @@ -63,25 +63,25 @@ const duplicateProperty = new ValidatedMethod({ // re-map all the ancestors setLineageOfDocs({ - docArray: nodes, - newAncestry : [ + docArray: nodes, + 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; - + // Mark the sheet as needing recompute property.dirty = true; // Insert the properties - CreatureProperties.batchInsert([property, ...nodes]); + CreatureProperties.batchInsert([property, ...nodes]); // Tree structure changed by inserts, reorder the tree reorderDocs({ diff --git a/app/imports/api/creature/creatureProperties/methods/equipItem.js b/app/imports/api/creature/creatureProperties/methods/equipItem.js index a8bbb911..671908b3 100644 --- a/app/imports/api/creature/creatureProperties/methods/equipItem.js +++ b/app/imports/api/creature/creatureProperties/methods/equipItem.js @@ -10,8 +10,8 @@ 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}){ - if (!_id) throw new Meteor.Error('No _id', '_id is required'); + 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,20 +21,20 @@ 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'); + 'Equip and unequip can only be performed on items'); let creature = getRootCreatureAncestor(item); assertEditPermission(creature, this.userId); 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: { diff --git a/app/imports/api/creature/creatureProperties/methods/flipToggle.js b/app/imports/api/creature/creatureProperties/methods/flipToggle.js index df563cdc..dbd814ff 100644 --- a/app/imports/api/creature/creatureProperties/methods/flipToggle.js +++ b/app/imports/api/creature/creatureProperties/methods/flipToggle.js @@ -6,24 +6,24 @@ import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/ge const flipToggle = new ValidatedMethod({ name: 'creatureProperties.flipToggle', - validate({_id}){ - if (!_id) throw new Meteor.Error('No _id', '_id is required'); + validate({ _id }) { + if (!_id) throw new Meteor.Error('No _id', '_id is required'); }, mixins: [RateLimiterMixin], rateLimit: { 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,13 +32,15 @@ const flipToggle = new ValidatedMethod({ // Invert the current value, disabled is the canonical store of value const currentValue = !property.disabled; - CreatureProperties.update(_id, {$set: { - enabled: !currentValue, - disabled: currentValue, - dirty: true, - }}, { - selector: {type: 'toggle'}, - }); + CreatureProperties.update(_id, { + $set: { + enabled: !currentValue, + disabled: currentValue, + dirty: true, + } + }, { + selector: { type: 'toggle' }, + }); }, }); diff --git a/app/imports/api/creature/creatureProperties/methods/insertProperty.js b/app/imports/api/creature/creatureProperties/methods/insertProperty.js index 5d3567b0..2d872868 100644 --- a/app/imports/api/creature/creatureProperties/methods/insertProperty.js +++ b/app/imports/api/creature/creatureProperties/methods/insertProperty.js @@ -12,7 +12,7 @@ import { getHighestOrder } from '/imports/api/parenting/order.js'; const insertProperty = new ValidatedMethod({ name: 'creatureProperties.insert', - validate: new SimpleSchema({ + validate: new SimpleSchema({ creatureProperty: { type: Object, blackbox: true, @@ -24,25 +24,25 @@ 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 + // 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` - } + } else { + throw `${parentRef.collection} is not a valid parent collection` + } assertEditPermission(rootCreature, this.userId); creatureProperty.parent = parentRef; creatureProperty.ancestors = ancestors; - return insertPropertyWork({ + return insertPropertyWork({ property: creatureProperty, creature: rootCreature, }); @@ -75,31 +75,31 @@ 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` - } + } else { + throw `${parentRef.collection} is not a valid parent collection` + } 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; @@ -122,14 +122,14 @@ const insertPropertyAsChildOfTag = new ValidatedMethod({ creatureProperty.parent = parentRef; creatureProperty.ancestors = ancestors; - return insertPropertyWork({ + return insertPropertyWork({ property: creatureProperty, creature: rootCreature, }); }, }); -export function insertPropertyWork({property, creature}){ +export function insertPropertyWork({ property, creature }) { delete property._id; property.dirty = true; let _id = CreatureProperties.insert(property); diff --git a/app/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js b/app/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js index 10de2b4a..641a9cfb 100644 --- a/app/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js +++ b/app/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js @@ -7,57 +7,57 @@ import { RefSchema } from '/imports/api/parenting/ChildSchema.js'; import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js'; import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js'; import { - setLineageOfDocs, - getAncestry, - renewDocIds + setLineageOfDocs, + getAncestry, + renewDocIds } from '/imports/api/parenting/parenting.js'; import { reorderDocs } from '/imports/api/parenting/order.js'; import { setDocToLastOrder } from '/imports/api/parenting/order.js'; import fetchDocByRef from '/imports/api/parenting/fetchDocByRef.js'; const insertPropertyFromLibraryNode = new ValidatedMethod({ - name: 'creatureProperties.insertPropertyFromLibraryNode', - validate: new SimpleSchema({ + name: 'creatureProperties.insertPropertyFromLibraryNode', + validate: new SimpleSchema({ nodeIds: { type: Array, max: 20, }, - 'nodeIds.$': { - type: String, - regEx: SimpleSchema.RegEx.Id, - }, - parentRef: { - type: RefSchema, - }, + 'nodeIds.$': { + type: String, + regEx: SimpleSchema.RegEx.Id, + }, + parentRef: { + type: RefSchema, + }, order: { type: Number, optional: true, }, - }).validator(), + }).validator(), mixins: [RateLimiterMixin], rateLimit: { numRequests: 5, timeInterval: 5000, }, - run({nodeIds, parentRef, order}) { - // get the new ancestry for the properties - let {parentDoc, ancestors} = getAncestry({parentRef}); + run({ nodeIds, parentRef, order }) { + // get the new ancestry for the properties + let { parentDoc, ancestors } = getAncestry({ parentRef }); - // Check permission to edit + // 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` - } + } else { + throw `${parentRef.collection} is not a valid parent collection` + } assertEditPermission(rootCreature, this.userId); // {libraryId: hasViewPermission} //let libraryPermissionMemoir = {}; let node; - nodeIds.forEach(nodeId => { + nodeIds.forEach(nodeId => { // TODO: Check library view permission for each node before starting node = insertPropertyFromNode(nodeId, ancestors, order); }); @@ -70,18 +70,18 @@ const insertPropertyFromLibraryNode = new ValidatedMethod({ collection: CreatureProperties, ancestorId: rootCreature._id, }); - // Return the docId of the last property, the inserted root property - return rootId; - }, + // Return the docId of the last property, the inserted root property + return rootId; + }, }); -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){ - node.cache = {error: e.reason || e.message || e.toString()}; + } catch (e) { + 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 @@ -195,20 +195,20 @@ function reifyNodeReferences(nodes, visitedRefs = new Set(), depth = 0){ // re-map all the ancestors to parent the new sub-tree into our existing // node tree - setLineageOfDocs({ - docArray: addedNodes, - newAncestry: node.ancestors, - oldParent: referencedNode.parent, - }); + setLineageOfDocs({ + docArray: addedNodes, + newAncestry: node.ancestors, + oldParent: referencedNode.parent, + }); // 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 diff --git a/app/imports/api/creature/creatureProperties/methods/pullFromProperty.js b/app/imports/api/creature/creatureProperties/methods/pullFromProperty.js index 3d8f99ea..4dd8245e 100644 --- a/app/imports/api/creature/creatureProperties/methods/pullFromProperty.js +++ b/app/imports/api/creature/creatureProperties/methods/pullFromProperty.js @@ -5,28 +5,28 @@ import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js'; const pullFromProperty = new ValidatedMethod({ - name: 'creatureProperties.pull', - validate: null, + name: 'creatureProperties.pull', + validate: null, mixins: [RateLimiterMixin], rateLimit: { numRequests: 5, timeInterval: 5000, }, - run({_id, path, itemId}){ + run({ _id, path, itemId }) { // Permissions - let property = CreatureProperties.findOne(_id); + let property = CreatureProperties.findOne(_id); let rootCreature = getRootCreatureAncestor(property); assertEditPermission(rootCreature, this.userId); // Do work - CreatureProperties.update(_id, { + CreatureProperties.update(_id, { $pull: { [path.join('.')]: { _id: itemId } }, $set: { dirty: true } - }, { - selector: {type: property.type}, - getAutoValues: false, - }); - } + }, { + selector: { type: property.type }, + getAutoValues: false, + }); + } }); export default pullFromProperty; diff --git a/app/imports/api/creature/creatureProperties/methods/pushToProperty.js b/app/imports/api/creature/creatureProperties/methods/pushToProperty.js index 0ec4719c..95735d9b 100644 --- a/app/imports/api/creature/creatureProperties/methods/pushToProperty.js +++ b/app/imports/api/creature/creatureProperties/methods/pushToProperty.js @@ -6,16 +6,16 @@ import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/ge import { get } from 'lodash'; const pushToProperty = new ValidatedMethod({ - name: 'creatureProperties.push', - validate: null, + name: 'creatureProperties.push', + validate: null, mixins: [RateLimiterMixin], rateLimit: { numRequests: 5, timeInterval: 5000, }, - run({_id, path, value}){ + run({ _id, path, value }) { // Permissions - let property = CreatureProperties.findOne(_id); + let property = CreatureProperties.findOne(_id); let rootCreature = getRootCreatureAncestor(property); assertEditPermission(rootCreature, this.userId); @@ -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` @@ -37,13 +37,13 @@ const pushToProperty = new ValidatedMethod({ } // Do work - CreatureProperties.update(_id, { + CreatureProperties.update(_id, { $push: { [joinedPath]: value }, $set: { dirty: true }, - }, { - selector: {type: property.type}, - }); - } + }, { + selector: { type: property.type }, + }); + } }); export default pushToProperty; diff --git a/app/imports/api/creature/creatureProperties/methods/restoreProperty.js b/app/imports/api/creature/creatureProperties/methods/restoreProperty.js index 02ed7637..9e66448e 100644 --- a/app/imports/api/creature/creatureProperties/methods/restoreProperty.js +++ b/app/imports/api/creature/creatureProperties/methods/restoreProperty.js @@ -7,18 +7,18 @@ import { restore } from '/imports/api/parenting/softRemove.js'; import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js'; const restoreProperty = new ValidatedMethod({ - name: 'creatureProperties.restore', - validate: new SimpleSchema({ - _id: SimpleSchema.RegEx.Id - }).validator(), + name: 'creatureProperties.restore', + validate: new SimpleSchema({ + _id: SimpleSchema.RegEx.Id + }).validator(), mixins: [RateLimiterMixin], rateLimit: { numRequests: 5, timeInterval: 5000, }, - run({_id}){ + run({ _id }) { // Permissions - let property = CreatureProperties.findOne(_id); + let property = CreatureProperties.findOne(_id); let rootCreature = getRootCreatureAncestor(property); assertEditPermission(rootCreature, this.userId); @@ -30,7 +30,7 @@ const restoreProperty = new ValidatedMethod({ $set: { dirty: true } }, }); - } + } }); export default restoreProperty; diff --git a/app/imports/api/creature/creatureProperties/methods/selectAmmoItem.js b/app/imports/api/creature/creatureProperties/methods/selectAmmoItem.js index 4f460287..57bbe6bd 100644 --- a/app/imports/api/creature/creatureProperties/methods/selectAmmoItem.js +++ b/app/imports/api/creature/creatureProperties/methods/selectAmmoItem.js @@ -17,20 +17,20 @@ const selectAmmoItem = new ValidatedMethod({ numRequests: 5, timeInterval: 5000, }, - run({actionId, itemId, itemConsumedIndex}) { + run({ actionId, itemId, itemConsumedIndex }) { // Permissions - let action = CreatureProperties.findOne(actionId); + let action = CreatureProperties.findOne(actionId); let rootCreature = getRootCreatureAncestor(action); - assertEditPermission(rootCreature, this.userId); + assertEditPermission(rootCreature, this.userId); // 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'); } diff --git a/app/imports/api/creature/creatureProperties/methods/softRemoveProperty.js b/app/imports/api/creature/creatureProperties/methods/softRemoveProperty.js index 96110e8e..a4240ac7 100644 --- a/app/imports/api/creature/creatureProperties/methods/softRemoveProperty.js +++ b/app/imports/api/creature/creatureProperties/methods/softRemoveProperty.js @@ -7,24 +7,24 @@ import { softRemove } from '/imports/api/parenting/softRemove.js'; import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/getRootCreatureAncestor.js'; const softRemoveProperty = new ValidatedMethod({ - name: 'creatureProperties.softRemove', - validate: new SimpleSchema({ - _id: SimpleSchema.RegEx.Id - }).validator(), + name: 'creatureProperties.softRemove', + validate: new SimpleSchema({ + _id: SimpleSchema.RegEx.Id + }).validator(), mixins: [RateLimiterMixin], rateLimit: { numRequests: 5, timeInterval: 5000, }, - run({_id}){ + run({ _id }) { // Permissions - let property = CreatureProperties.findOne(_id); + let property = CreatureProperties.findOne(_id); let rootCreature = getRootCreatureAncestor(property); assertEditPermission(rootCreature, this.userId); // Do work - softRemove({_id, collection: CreatureProperties}); - } + softRemove({ _id, collection: CreatureProperties }); + } }); export default softRemoveProperty; diff --git a/app/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js b/app/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js index d6bf733c..4b606114 100644 --- a/app/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js +++ b/app/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js @@ -6,28 +6,28 @@ import getRootCreatureAncestor from '/imports/api/creature/creatureProperties/ge const updateCreatureProperty = new ValidatedMethod({ name: 'creatureProperties.update', - validate({_id, path}){ - if (!_id) throw new Meteor.Error('No _id', '_id is required'); - // We cannot change these fields with a simple update - switch (path[0]){ - case 'type': + validate({ _id, path }) { + if (!_id) throw new Meteor.Error('No _id', '_id is required'); + // We cannot change these fields with a simple update + switch (path[0]) { + case 'type': case 'order': case 'parent': case 'ancestors': - case 'damage': - throw new Meteor.Error('Permission denied', - 'This property can\'t be updated directly'); - } + case 'damage': + throw new Meteor.Error('Permission denied', + 'This property can\'t be updated directly'); + } }, mixins: [RateLimiterMixin], rateLimit: { numRequests: 5, timeInterval: 5000, }, - run({_id, path, value}) { + 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,14 +35,14 @@ const updateCreatureProperty = new ValidatedMethod({ let pathString = path.join('.'); let modifier; // unset empty values - if (value === null || value === undefined){ - modifier = { $unset: {[pathString]: 1}, $set: { dirty: true } }; + if (value === null || value === undefined) { + 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}, - }); + CreatureProperties.update(_id, modifier, { + selector: { type: property.type }, + }); }, }); diff --git a/app/imports/api/creature/creatureProperties/recomputeCreaturesByProperty.js b/app/imports/api/creature/creatureProperties/recomputeCreaturesByProperty.js index cee1237d..a2190860 100644 --- a/app/imports/api/creature/creatureProperties/recomputeCreaturesByProperty.js +++ b/app/imports/api/creature/creatureProperties/recomputeCreaturesByProperty.js @@ -4,9 +4,9 @@ import computeCreature from '/imports/api/engine/computeCreature.js'; * Recomputes all ancestor creatures of this property */ export default function recomputeCreaturesByProperty(property){ - for (let ref of property.ancestors){ - if (ref.collection === 'creatures') { - computeCreature.call(ref.id); - } - } + for (let ref of property.ancestors){ + if (ref.collection === 'creatures') { + computeCreature.call(ref.id); + } + } } diff --git a/app/imports/api/creature/creatures/Creatures.js b/app/imports/api/creature/creatures/Creatures.js index 25ff5021..f13932ee 100644 --- a/app/imports/api/creature/creatures/Creatures.js +++ b/app/imports/api/creature/creatures/Creatures.js @@ -8,21 +8,21 @@ import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js'; let Creatures = new Mongo.Collection('creatures'); let CreatureSettingsSchema = new SimpleSchema({ - //slowed down by carrying too much? - useVariantEncumbrance: { - type: Boolean, - optional: true, - }, - //hide spellcasting tab - hideSpellcasting: { - type: Boolean, - optional: true, - }, - // Swap around the modifier and stat - swapStatAndModifier: { - type: Boolean, - optional: true, - }, + //slowed down by carrying too much? + useVariantEncumbrance: { + type: Boolean, + optional: true, + }, + //hide spellcasting tab + hideSpellcasting: { + type: Boolean, + optional: true, + }, + // Swap around the modifier and stat + swapStatAndModifier: { + type: Boolean, + optional: true, + }, // Hide all the unused stats hideUnusedStats: { type: Boolean, @@ -58,28 +58,28 @@ let CreatureSettingsSchema = new SimpleSchema({ }); let CreatureSchema = new SimpleSchema({ - // Strings - name: { - type: String, - defaultValue: '', - optional: true, + // Strings + name: { + type: String, + defaultValue: '', + optional: true, max: STORAGE_LIMITS.name, - }, - alignment: { - type: String, - optional: true, + }, + alignment: { + type: String, + optional: true, max: STORAGE_LIMITS.name, - }, - gender: { - type: String, - optional: true, + }, + gender: { + type: String, + optional: true, max: STORAGE_LIMITS.name, - }, - picture: { - type: String, - optional: true, + }, + picture: { + type: String, + optional: true, max: STORAGE_LIMITS.url, - }, + }, avatarPicture: { type: String, optional: true, @@ -90,37 +90,37 @@ let CreatureSchema = new SimpleSchema({ allowedLibraries: { type: Array, optional: true, - maxCount: 100, - }, - 'allowedLibraries.$': { - type: String, + maxCount: 100, + }, + 'allowedLibraries.$': { + type: String, regEx: SimpleSchema.RegEx.Id, - }, - allowedLibraryCollections: { - type: Array, + }, + allowedLibraryCollections: { + type: Array, optional: true, - maxCount: 100, - }, - 'allowedLibraryCollections.$': { - type: String, + maxCount: 100, + }, + 'allowedLibraryCollections.$': { + type: String, regEx: SimpleSchema.RegEx.Id, }, - // Mechanics - deathSave: { - type: deathSaveSchema, - defaultValue: {}, - }, + // Mechanics + deathSave: { + type: deathSaveSchema, + defaultValue: {}, + }, // Stats that are computed and denormalised outside of recomputation denormalizedStats: { type: Object, defaultValue: {}, }, // Sum of all XP gained by this character - 'denormalizedStats.xp': { - type: SimpleSchema.Integer, - defaultValue: 0, - }, + 'denormalizedStats.xp': { + type: SimpleSchema.Integer, + defaultValue: 0, + }, // Sum of all levels granted by milestone XP 'denormalizedStats.milestoneLevels': { type: SimpleSchema.Integer, @@ -133,24 +133,24 @@ let CreatureSchema = new SimpleSchema({ }, // Version of computation engine that was last used to compute this creature computeVersion: { - type: String, + type: String, optional: true, - }, - type: { - type: String, - defaultValue: 'pc', - allowedValues: ['pc', 'npc', 'monster'], - }, + }, + type: { + type: String, + defaultValue: 'pc', + allowedValues: ['pc', 'npc', 'monster'], + }, damageMultipliers: { type: Object, - blackbox: true, - defaultValue: {} + blackbox: true, + defaultValue: {} + }, + variables: { + type: Object, + blackbox: true, + defaultValue: {} }, - variables: { - type: Object, - blackbox: true, - defaultValue: {} - }, computeErrors: { type: Array, optional: true, @@ -161,7 +161,7 @@ let CreatureSchema = new SimpleSchema({ 'computeErrors.$.type': { type: String, }, - 'computeErrors.$.details' : { + 'computeErrors.$.details': { type: Object, blackbox: true, optional: true, @@ -178,11 +178,11 @@ let CreatureSchema = new SimpleSchema({ optional: true, }, - // Settings - settings: { - type: CreatureSettingsSchema, - defaultValue: {}, - }, + // Settings + settings: { + type: CreatureSettingsSchema, + defaultValue: {}, + }, }); CreatureSchema.extend(ColorSchema); diff --git a/app/imports/api/creature/creatures/methods/changeAllowedLibraries.js b/app/imports/api/creature/creatures/methods/changeAllowedLibraries.js index 29057f55..05a8e9d6 100644 --- a/app/imports/api/creature/creatures/methods/changeAllowedLibraries.js +++ b/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,8 +36,8 @@ const changeAllowedLibraries = new ValidatedMethod({ numRequests: 10, timeInterval: 5000, }, - run({_id, allowedLibraries, allowedLibraryCollections}) { - let creature = Creatures.findOne(_id); + run({ _id, allowedLibraries, allowedLibraryCollections }) { + let creature = Creatures.findOne(_id); assertEditPermission(creature, this.userId); let $set; if (allowedLibraries) { @@ -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 }; diff --git a/app/imports/api/creature/creatures/methods/insertCreature.js b/app/imports/api/creature/creatures/methods/insertCreature.js index da72f6ed..c978785b 100644 --- a/app/imports/api/creature/creatures/methods/insertCreature.js +++ b/app/imports/api/creature/creatures/methods/insertCreature.js @@ -51,7 +51,7 @@ const insertCreature = new ValidatedMethod({ allowedLibraries, allowedLibraryCollections, }); - + // Insert experience to get character to starting level if (startingLevel) { insertExperienceForCreature({ @@ -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; } @@ -81,7 +81,7 @@ const insertCreature = new ValidatedMethod({ insertDefaultRuleset(creatureId, baseId, userId, rulesetSlot); } - return creatureId; + return creatureId; }, }); @@ -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, }); } diff --git a/app/imports/api/creature/creatures/methods/updateCreature.js b/app/imports/api/creature/creatures/methods/updateCreature.js index 6530ccae..4da290bc 100644 --- a/app/imports/api/creature/creatures/methods/updateCreature.js +++ b/app/imports/api/creature/creatures/methods/updateCreature.js @@ -1,14 +1,14 @@ 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}){ - if (!_id) return false; - // Allowed fields - let allowedFields = [ + validate({ _id, path }) { + if (!_id) return false; + // Allowed fields + let allowedFields = [ 'name', 'alignment', 'gender', @@ -17,26 +17,26 @@ const updateCreature = new ValidatedMethod({ 'color', 'settings', ]; - if (!allowedFields.includes(path[0])){ - throw new Meteor.Error('Creatures.methods.update.denied', - 'This field can\'t be updated using this method'); - } + if (!allowedFields.includes(path[0])) { + throw new Meteor.Error('Creatures.methods.update.denied', + 'This field can\'t be updated using this method'); + } }, mixins: [RateLimiterMixin], rateLimit: { numRequests: 5, timeInterval: 5000, }, - run({_id, path, value}) { - let creature = Creatures.findOne(_id); + 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 }, }); } }, diff --git a/app/imports/api/creature/experience/Experiences.js b/app/imports/api/creature/experience/Experiences.js index 58b1aeed..d1c5c527 100644 --- a/app/imports/api/creature/experience/Experiences.js +++ b/app/imports/api/creature/experience/Experiences.js @@ -8,17 +8,17 @@ import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js'; let Experiences = new Mongo.Collection('experiences'); let ExperienceSchema = new SimpleSchema({ - name: { - type: String, - optional: true, + name: { + type: String, + optional: true, max: STORAGE_LIMITS.name, - }, - // The amount of XP this experience gives - xp: { - type: SimpleSchema.Integer, - optional: true, + }, + // The amount of XP this experience gives + xp: { + type: SimpleSchema.Integer, + optional: true, min: 0, - }, + }, // Setting levels instead of value grants whole levels levels: { type: SimpleSchema.Integer, @@ -26,17 +26,17 @@ let ExperienceSchema = new SimpleSchema({ min: 0, index: 1, }, - // The real-world date that it occured, usually sorted by date - date: { - type: Date, - autoValue: function() { - // If the date isn't set, set it to now - if (!this.isSet) { - return new Date(); - } - }, + // The real-world date that it occured, usually sorted by date + date: { + type: Date, + autoValue: function () { + // If the date isn't set, set it to now + if (!this.isSet) { + return new Date(); + } + }, index: 1, - }, + }, creatureId: { type: String, regEx: SimpleSchema.RegEx.Id, @@ -46,8 +46,8 @@ let ExperienceSchema = new SimpleSchema({ Experiences.attachSchema(ExperienceSchema); -const insertExperienceForCreature = function({experience, creatureId, userId}){ - if (experience.xp){ +const insertExperienceForCreature = function ({ experience, creatureId }) { + if (experience.xp) { Creatures.update(creatureId, { $inc: { 'denormalizedStats.xp': experience.xp }, $set: { dirty: true }, @@ -84,16 +84,16 @@ 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', - 'You need to be logged in to insert an experience'); + 'You need to be logged in to insert an experience'); } 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,17 +113,17 @@ 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', - 'You need to be logged in to remove an experience'); + 'You need to be logged in to remove an experience'); } let experience = Experiences.findOne(experienceId); 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,11 +154,11 @@ 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', - 'You need to be logged in to recompute a creature\'s experiences'); + 'You need to be logged in to recompute a creature\'s experiences'); } assertEditPermission(creatureId, userId); @@ -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: { - 'denormalizedStats.xp': xp, - 'denormalizedStats.milestoneLevels': milestoneLevels, - dirty: true, - }}); + Creatures.update(creatureId, { + $set: { + 'denormalizedStats.xp': xp, + 'denormalizedStats.milestoneLevels': milestoneLevels, + dirty: true, + } + }); }, }); diff --git a/app/imports/api/creature/journal/JournalEntry.js b/app/imports/api/creature/journal/JournalEntry.js index 43d5ecc2..74b885ea 100644 --- a/app/imports/api/creature/journal/JournalEntry.js +++ b/app/imports/api/creature/journal/JournalEntry.js @@ -2,33 +2,33 @@ import SimpleSchema from 'simpl-schema'; import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js'; let ExperienceSchema = new SimpleSchema({ - title: { - type: String, - optional: true, + title: { + type: String, + optional: true, max: STORAGE_LIMITS.name, - }, - // Potentially long description of the event - description: { - type: String, - optional: true, + }, + // Potentially long description of the event + description: { + type: String, + optional: true, max: STORAGE_LIMITS.description, - }, - // The real-world date that it occured - date: { - type: Date, - autoValue: function() { - // If the date isn't set, set it to now - if (!this.isSet) { - return new Date(); - } - }, - }, - // The date in-world of this event - worldDate: { - type: String, - optional: true, + }, + // The real-world date that it occured + date: { + type: Date, + autoValue: function () { + // If the date isn't set, set it to now + if (!this.isSet) { + return new Date(); + } + }, + }, + // The date in-world of this event + worldDate: { + type: String, + optional: true, max: STORAGE_LIMITS.name, - }, + }, // Tags to better find this entry later tags: { type: Array, diff --git a/app/imports/api/creature/log/CreatureLogs.js b/app/imports/api/creature/log/CreatureLogs.js index de7777b7..5b858b29 100644 --- a/app/imports/api/creature/log/CreatureLogs.js +++ b/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 {parse, prettifyParseError} from '/imports/parser/parser.js'; +import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.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; } @@ -25,17 +25,17 @@ let CreatureLogSchema = new SimpleSchema({ 'content.$': { type: LogContentSchema, }, - // The real-world date that it occured, usually sorted by date - date: { - type: Date, - autoValue: function() { - // If the date isn't set, set it to now - if (!this.isSet) { - return new Date(); - } - }, + // The real-world date that it occured, usually sorted by date + date: { + type: Date, + autoValue: function () { + // If the date isn't set, set it to now + if (!this.isSet) { + return new Date(); + } + }, index: 1, - }, + }, creatureId: { type: String, regEx: SimpleSchema.RegEx.Id, @@ -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}){ - if (Meteor.isServer){ +function logWebhook({ log, creature }) { + if (Meteor.isServer) { sendWebhookAsCreature({ creature, data: logToMessageData(log), @@ -94,47 +94,49 @@ const insertCreatureLog = new ValidatedMethod({ numRequests: 5, timeInterval: 5000, }, - validate: new SimpleSchema({ - log: CreatureLogSchema.omit('date'), - }).validator(), - run({log}){ + validate: new SimpleSchema({ + log: CreatureLogSchema.omit('date'), + }).validator(), + run({ log }) { const creatureId = log.creatureId; - const creature = Creatures.findOne(creatureId, {fields: { - readers: 1, - writers: 1, - owner: 1, - 'settings.discordWebhook': 1, - name: 1, - avatarPicture: 1, - }}); + 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'){ - log = {content: [{value: log}]}; + if (typeof log === 'string') { + 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({ @@ -144,33 +146,35 @@ const logRoll = new ValidatedMethod({ numRequests: 5, timeInterval: 5000, }, - validate: new SimpleSchema({ - roll: { - type: String, - }, - creatureId: { - type: String, - regEx: SimpleSchema.RegEx.Id, - }, - }).validator(), - run({roll, creatureId}){ - const creature = Creatures.findOne(creatureId, {fields: { - readers: 1, - writers: 1, - owner: 1, - 'settings.discordWebhook': 1, - name: 1, - avatarPicture: 1, - }}); + validate: new SimpleSchema({ + roll: { + type: String, + }, + creatureId: { + type: String, + regEx: SimpleSchema.RegEx.Id, + }, + }).validator(), + run({ roll, creatureId }) { + 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 }; diff --git a/app/imports/api/docs/Docs.js b/app/imports/api/docs/Docs.js new file mode 100644 index 00000000..91961b16 --- /dev/null +++ b/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; diff --git a/app/imports/api/engine/actions/applyProperty.js b/app/imports/api/engine/actions/applyProperty.js index 805d420e..4dc1cb79 100644 --- a/app/imports/api/engine/actions/applyProperty.js +++ b/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, diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyAction.js b/app/imports/api/engine/actions/applyPropertyByType/applyAction.js index 26da462a..8d6bd185 100644 --- a/app/imports/api/engine/actions/applyPropertyByType/applyAction.js +++ b/app/imports/api/engine/actions/applyPropertyByType/applyAction.js @@ -20,7 +20,7 @@ export default function applyAction(node, actionContext) { recalculateInlineCalculations(prop.summary, actionContext); content.value = prop.summary.value; } - actionContext.addLog(content); + if (!prop.silent) actionContext.addLog(content); // Spend the resources const failed = spendResources(prop, actionContext); @@ -188,7 +188,7 @@ function applyChildren(node, actionContext) { function spendResources(prop, actionContext){ // Check Uses if (prop.usesLeft <= 0){ - actionContext.addLog({ + if (!prop.silent) actionContext.addLog({ name: 'Error', value: `${prop.name || 'action'} does not have enough uses left`, }); @@ -196,7 +196,7 @@ function spendResources(prop, actionContext){ } // Resources if (prop.insufficientResources){ - actionContext.addLog({ + if (!prop.silent) actionContext.addLog({ name: 'Error', value: 'This creature doesn\'t have sufficient resources to perform this action', }); @@ -257,7 +257,7 @@ function spendResources(prop, actionContext){ }, { selector: prop }); - actionContext.addLog({ + if (!prop.silent) actionContext.addLog({ name: 'Uses left', value: prop.usesLeft - 1, inline: true, @@ -288,12 +288,12 @@ function spendResources(prop, actionContext){ }); // Log all the spending - if (gainLog.length) actionContext.addLog({ + if (gainLog.length && !prop.silent) actionContext.addLog({ name: 'Gained', value: gainLog.join('\n'), inline: true, }); - if (spendLog.length) actionContext.addLog({ + if (spendLog.length && !prop.silent) actionContext.addLog({ name: 'Spent', value: spendLog.join('\n'), inline: true, diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyAdjustment.js b/app/imports/api/engine/actions/applyPropertyByType/applyAdjustment.js index cc63f53a..ede94665 100644 --- a/app/imports/api/engine/actions/applyPropertyByType/applyAdjustment.js +++ b/app/imports/api/engine/actions/applyPropertyByType/applyAdjustment.js @@ -24,7 +24,7 @@ export default function applyAdjustment(node, actionContext){ damageTargets.forEach(target => { let stat = target.variables[prop.stat]; if (!stat?.type) { - actionContext.addLog({ + if (!prop.silent) actionContext.addLog({ name: 'Error', value: `Could not apply attribute damage, creature does not have \`${prop.stat}\` set` }); @@ -36,7 +36,7 @@ export default function applyAdjustment(node, actionContext){ value, actionContext, }); - actionContext.addLog({ + if (!prop.silent) actionContext.addLog({ name: 'Attribute damage', value: `${prop.stat}${prop.operation === 'set' ? ' set to' : ''}` + ` ${value}`, @@ -44,7 +44,7 @@ export default function applyAdjustment(node, actionContext){ }); }); } else { - actionContext.addLog({ + if (!prop.silent) actionContext.addLog({ name: 'Attribute damage', value: `${prop.stat}${prop.operation === 'set' ? ' set to' : ''}` + ` ${value}`, diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyBranch.js b/app/imports/api/engine/actions/applyPropertyByType/applyBranch.js index 3106b88b..ce918c4a 100644 --- a/app/imports/api/engine/actions/applyPropertyByType/applyBranch.js +++ b/app/imports/api/engine/actions/applyPropertyByType/applyBranch.js @@ -36,25 +36,25 @@ export default function applyBranch(node, actionContext){ break; case 'hit': if (scope['$attackHit']?.value){ - if (!targets.length) actionContext.addLog({value: '**On hit**'}); + if (!targets.length && !prop.silent) actionContext.addLog({value: '**On hit**'}); applyChildren(); } break; case 'miss': if (scope['$attackMiss']?.value){ - if (!targets.length) actionContext.addLog({value: '**On miss**'}); + if (!targets.length && !prop.silent) actionContext.addLog({value: '**On miss**'}); applyChildren(); } break; case 'failedSave': if (scope['$saveFailed']?.value){ - if (!targets.length) actionContext.addLog({value: '**On failed save**'}); + if (!targets.length && !prop.silent) actionContext.addLog({value: '**On failed save**'}); applyChildren(); } break; case 'successfulSave': if (scope['$saveSucceeded']?.value){ - if (!targets.length) actionContext.addLog({value: '**On save**',}); + if (!targets.length && !prop.silent) actionContext.addLog({value: '**On save**',}); applyChildren(); } break; diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyBuff.js b/app/imports/api/engine/actions/applyPropertyByType/applyBuff.js index 965ef8b3..4e68eabe 100644 --- a/app/imports/api/engine/actions/applyPropertyByType/applyBuff.js +++ b/app/imports/api/engine/actions/applyPropertyByType/applyBuff.js @@ -1,8 +1,8 @@ import { - setLineageOfDocs, - renewDocIds + 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'; @@ -13,15 +13,16 @@ import logErrors from './shared/logErrors.js'; import { insertCreatureLog } from '/imports/api/creature/log/CreatureLogs.js'; 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); @@ -32,7 +33,9 @@ export default function applyBuff(node, actionContext){ }); } addChildrenToPropList(node.children); - crystalizeVariables({propList, actionContext}); + if (!prop.skipCrystalization) { + crystalizeVariables({ propList, actionContext }); + } let oldParent = { id: prop.parent.id, @@ -43,8 +46,8 @@ export default function applyBuff(node, actionContext){ copyNodeListToTarget(propList, target, oldParent); //Log the buff - if (prop.name || prop.description?.value){ - if (target._id === actionContext.creature._id){ + if ((prop.name || prop.description?.value) && !prop.silent) { + if (target._id === actionContext.creature._id) { // Targeting self actionContext.addLog({ name: prop.name, @@ -69,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){ - let ancestry = [{collection: 'creatures', id: target._id}]; +function copyNodeListToTarget(propList, target, oldParent) { + let ancestry = [{ collection: 'creatures', id: target._id }]; setLineageOfDocs({ docArray: propList, newAncestry: ancestry, @@ -90,13 +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; } - computedSchemas[prop.type].computedFields().forEach( calcKey => { + // Iterate through all the calculations and crystalize them + computedSchemas[prop.type].computedFields().forEach(calcKey => { applyFnToKey(prop, calcKey, (prop, key) => { const calcObj = get(prop, key); if (!calcObj?.parseNode) return; @@ -106,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){ - return symbol.create({name: node.name}) + if (!node.path.length) { + return symbol.create({ name: node.name }) } } else { // Can't strip symbols @@ -123,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; } @@ -132,5 +136,36 @@ function crystalizeVariables({propList, actionContext}){ calcObj.hash = cyrb53(calcObj.calculation); }); }); + // For each key in the schema + 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) { + return; + } + + // Replace all the existing calculations + let index = -1; + inlineCalcObj.text = inlineCalcObj.text.replace(INLINE_CALCULATION_REGEX, () => { + index += 1; + return `{${inlineCalcObj.inlineCalculations[index].calculation}}`; + }); + + // Set the value to the uncomputed string + inlineCalcObj.value = inlineCalcObj.text; + + // Write a new hash + const inlineCalcHash = cyrb53(inlineCalcObj.text); + if (inlineCalcHash === inlineCalcObj.hash) { + // Skip if nothing changed + return; + } + inlineCalcObj.hash = inlineCalcHash; + }); + }); }); } diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyBuffRemover.js b/app/imports/api/engine/actions/applyPropertyByType/applyBuffRemover.js index 09e4e987..86b60949 100644 --- a/app/imports/api/engine/actions/applyPropertyByType/applyBuffRemover.js +++ b/app/imports/api/engine/actions/applyPropertyByType/applyBuffRemover.js @@ -13,7 +13,7 @@ export default function applyBuffRemover(node, actionContext) { const prop = node.node; // Log Name - if (prop.name){ + if (prop.name && !prop.silent){ actionContext.addLog({ name: prop.name }); } @@ -29,7 +29,7 @@ export default function applyBuffRemover(node, actionContext) { }); return; } - removeBuff(nearestBuff, actionContext); + removeBuff(nearestBuff, actionContext, prop); } else { // Get all the buffs targeted by tags const allBuffs = getPropertiesOfType(actionContext.creature._id, 'buff'); @@ -41,7 +41,7 @@ export default function applyBuffRemover(node, actionContext) { if (prop.removeAll) { // Remove all matching buffs targetedBuffs.forEach(buff => { - removeBuff(buff, actionContext); + removeBuff(buff, actionContext, prop); }); } else { // Sort in reverse order @@ -49,7 +49,7 @@ export default function applyBuffRemover(node, actionContext) { // Remove the one with the highest order const buff = targetedBuffs[0]; if (buff) { - removeBuff(buff, actionContext); + removeBuff(buff, actionContext, prop); } } } @@ -60,8 +60,8 @@ export default function applyBuffRemover(node, actionContext) { node.children.forEach(child => applyProperty(child, actionContext)); } -function removeBuff(buff, actionContext) { - actionContext.addLog({ +function removeBuff(buff, actionContext, prop) { + if (!prop.silent) actionContext.addLog({ name: 'Removed', value: `${buff.name || 'Buff'}` }); diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyDamage.js b/app/imports/api/engine/actions/applyPropertyByType/applyDamage.js index 0ee3bbd7..c35546de 100644 --- a/app/imports/api/engine/actions/applyPropertyByType/applyDamage.js +++ b/app/imports/api/engine/actions/applyPropertyByType/applyDamage.js @@ -1,4 +1,4 @@ -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 resolve, { Context, toString } from '/imports/parser/resolve.js'; @@ -128,7 +128,7 @@ export default function applyDamage(node, actionContext){ // There are no targets, just log the result logValue.push(`**${damage}** ${suffix}`); } - actionContext.addLog({ + if (!prop.silent) actionContext.addLog({ name: logName, value: logValue.join('\n'), inline: true, @@ -147,21 +147,21 @@ function applyDamageMultipliers({target, damage, damageProp, logValue}){ 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; @@ -219,6 +222,16 @@ function dealDamage({target, damageType, amount, actionContext}){ if (damageType === 'healing') damageLeft = -totalDamage; healthBars.forEach(healthBar => { if (damageLeft === 0) return; + // Replace the healthbar by the one in the action context if we can + // The damagePropertyWork function bashes the prop with the damage + // So we can use the new value in later action properties + if (healthBar.variableName) { + const targetHealthBar = target.variables[healthBar.variableName]; + if (targetHealthBar?._id === healthBar._id) { + healthBar = targetHealthBar; + } + } + // Do the damage let damageAdded = damagePropertyWork({ prop: healthBar, operation: 'increment', diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyFolder.js b/app/imports/api/engine/actions/applyPropertyByType/applyFolder.js new file mode 100644 index 00000000..0965f56d --- /dev/null +++ b/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)); +} diff --git a/app/imports/api/engine/actions/applyPropertyByType/applySavingThrow.js b/app/imports/api/engine/actions/applyPropertyByType/applySavingThrow.js index 6064e3bd..a5aa4bae 100644 --- a/app/imports/api/engine/actions/applyPropertyByType/applySavingThrow.js +++ b/app/imports/api/engine/actions/applyPropertyByType/applySavingThrow.js @@ -20,7 +20,7 @@ export default function applySavingThrow(node, actionContext){ }); return node.children.forEach(child => applyProperty(child, actionContext)); } - actionContext.addLog({ + if (!prop.silent) actionContext.addLog({ name: prop.name, value: `DC **${dc}**`, inline: true, @@ -94,7 +94,7 @@ export default function applySavingThrow(node, actionContext){ } else { scope['$saveFailed'] = {value: true}; } - actionContext.addLog({ + if (!prop.silent) actionContext.addLog({ name: saveSuccess ? 'Successful save' : 'Failed save', value: resultPrefix + '\n**' + result + '**', inline: true, diff --git a/app/imports/api/engine/actions/applyPropertyByType/shared/recalculateCalculation.js b/app/imports/api/engine/actions/applyPropertyByType/shared/recalculateCalculation.js index 53e98e2d..2f484567 100644 --- a/app/imports/api/engine/actions/applyPropertyByType/shared/recalculateCalculation.js +++ b/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); } diff --git a/app/imports/api/engine/actions/applyTriggers.js b/app/imports/api/engine/actions/applyTriggers.js index 9343e1ac..8fd6a536 100644 --- a/app/imports/api/engine/actions/applyTriggers.js +++ b/app/imports/api/engine/actions/applyTriggers.js @@ -65,7 +65,7 @@ export function applyTrigger(trigger, prop, actionContext) { recalculateInlineCalculations(trigger.description, actionContext); content.value = trigger.description.value; } - actionContext.addLog(content); + if(!trigger.silent) actionContext.addLog(content); // Get all the trigger's properties and apply them const properties = getPropertyDecendants(actionContext.creature._id, trigger._id); diff --git a/app/imports/api/engine/actions/doAction.js b/app/imports/api/engine/actions/doAction.js index 51934483..57c7beac 100644 --- a/app/imports/api/engine/actions/doAction.js +++ b/app/imports/api/engine/actions/doAction.js @@ -41,8 +41,8 @@ const doAction = new ValidatedMethod({ let action = CreatureProperties.findOne(actionId); const creatureId = action.ancestors[0].id; const actionContext = new ActionContext(creatureId, targetIds, this); - - // Check permissions + + // Check permissions assertEditPermission(actionContext.creature, this.userId); actionContext.targets.forEach(target => { assertEditPermission(target, this.userId); @@ -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; diff --git a/app/imports/api/engine/actions/doCastSpell.js b/app/imports/api/engine/actions/doCastSpell.js index 95169e90..851ac0c2 100644 --- a/app/imports/api/engine/actions/doCastSpell.js +++ b/app/imports/api/engine/actions/doCastSpell.js @@ -9,7 +9,6 @@ import CreatureProperties from '/imports/api/creature/creatureProperties/Creatur import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js'; import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js'; import { doActionWork } from '/imports/api/engine/actions/doAction.js'; -import { CreatureLogSchema } from '/imports/api/creature/log/CreatureLogs.js'; import ActionContext from '/imports/api/engine/actions/ActionContext.js'; const doAction = new ValidatedMethod({ @@ -21,6 +20,10 @@ const doAction = new ValidatedMethod({ regEx: SimpleSchema.RegEx.Id, optional: true, }, + ritual: { + type: Boolean, + optional: true, + }, targetIds: { type: Array, defaultValue: [], @@ -42,13 +45,13 @@ const doAction = new ValidatedMethod({ numRequests: 10, timeInterval: 5000, }, - run({ spellId, slotId, targetIds = [], scope = {} }) { - // Get action context + run({ spellId, slotId, ritual, targetIds = [], scope = {} }) { + // Get action context let spell = CreatureProperties.findOne(spellId); const creatureId = spell.ancestors[0].id; const actionContext = new ActionContext(creatureId, targetIds, this); - // Check permissions + // Check permissions assertEditPermission(actionContext.creature, this.userId); actionContext.targets.forEach(target => { assertEditPermission(target, this.userId); @@ -65,27 +68,26 @@ const doAction = new ValidatedMethod({ let slotLevel = spell.level || 0; let slot; - actionContext.scope['slotLevel'] = slotLevel; - - if (slotId && !spell.castWithoutSpellSlots){ + // If a spell requires a slot, make sure a slot is spent + if (!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'); } @@ -99,16 +101,24 @@ 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) { - actionContext.addLog({ - name: `Casting at level ${slotLevel}` - }); + if (ritual) { + actionContext.addLog({ + name: `Ritual casting at level ${slotLevel}` + }); + } else { + actionContext.addLog({ + name: `Casting at level ${slotLevel}` + }); + } } + actionContext.scope['slotLevel'] = slotLevel; + // Do the action doActionWork({ properties, ancestors, actionContext, methodScope: scope, diff --git a/app/imports/api/engine/actions/doCheck.js b/app/imports/api/engine/actions/doCheck.js index 42e98f61..7242e57e 100644 --- a/app/imports/api/engine/actions/doCheck.js +++ b/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', @@ -72,7 +73,11 @@ 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){ @@ -106,3 +111,21 @@ function rollCheck(prop, actionContext) { 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}; +} diff --git a/app/imports/api/engine/computation/CreatureComputation.js b/app/imports/api/engine/computation/CreatureComputation.ts similarity index 68% rename from app/imports/api/engine/computation/CreatureComputation.js rename to app/imports/api/engine/computation/CreatureComputation.ts index 1fe14769..75ec51b3 100644 --- a/app/imports/api/engine/computation/CreatureComputation.js +++ b/app/imports/api/engine/computation/CreatureComputation.ts @@ -1,15 +1,30 @@ 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; + dependencyGraph: Graph; + errors: Array; + creature: object; + variables: object; + + constructor(properties: Array, creature: object, variables: object) { // Set up fields - this.originalPropsById = {}; - this.propsById = {}; + this.originalPropsById = {}; + this.propsById = {}; this.propsWithTag = {}; this.scope = {}; - this.props = properties; + this.props = properties; this.dependencyGraph = createGraph(); this.errors = []; this.creature = creature; diff --git a/app/imports/api/engine/computation/buildComputation/computeInactiveStatus.js b/app/imports/api/engine/computation/buildComputation/computeInactiveStatus.js index fcb2be07..5282e93e 100644 --- a/app/imports/api/engine/computation/buildComputation/computeInactiveStatus.js +++ b/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 - case 'item': return !!prop.equipped; + // Only equipped items with non-zero quantity have active children + 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; diff --git a/app/imports/api/engine/computation/buildComputation/computeToggleDependencies.js b/app/imports/api/engine/computation/buildComputation/computeToggleDependencies.js index 315d93f0..b7a98595 100644 --- a/app/imports/api/engine/computation/buildComputation/computeToggleDependencies.js +++ b/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'); diff --git a/app/imports/api/engine/computation/buildComputation/linkTypeDependencies.js b/app/imports/api/engine/computation/buildComputation/linkTypeDependencies.js index c729bf81..44fc93e9 100644 --- a/app/imports/api/engine/computation/buildComputation/linkTypeDependencies.js +++ b/app/imports/api/engine/computation/buildComputation/linkTypeDependencies.js @@ -14,6 +14,7 @@ const linkDependenciesByType = { effect: linkEffects, proficiency: linkProficiencies, roll: linkRoll, + pointBuy: linkPointBuy, propertySlot: linkSlot, skill: linkSkill, spell: linkAction, @@ -242,6 +243,28 @@ function linkDamageMultiplier(dependencyGraph, prop) { }); } +function linkPointBuy(dependencyGraph, prop){ + dependOnCalc({ dependencyGraph, prop, key: 'min' }); + dependOnCalc({ dependencyGraph, prop, key: 'max' }); + dependOnCalc({ dependencyGraph, prop, key: 'cost' }); + dependOnCalc({ dependencyGraph, prop, key: 'total' }); + prop.values?.forEach(row => { + // Wrap the document in a new object so we don't bash it unintentionally + const pointBuyRow = { + ...row, + type: 'pointBuyRow', + tableName: prop.name, + tableId: prop._id, + } + dependencyGraph.addNode(row._id, pointBuyRow); + linkVariableName(dependencyGraph, pointBuyRow); + dependOnCalc({ dependencyGraph, pointBuyRow, key: 'row.min' }); + dependOnCalc({ dependencyGraph, pointBuyRow, key: 'row.max' }); + dependOnCalc({ dependencyGraph, pointBuyRow, key: 'row.cost' }); + }); + if (prop.inactive) return; +} + function linkProficiencies(dependencyGraph, prop){ // The stats depend on the proficiency if (prop.inactive) return; diff --git a/app/imports/api/engine/computation/buildCreatureComputation.js b/app/imports/api/engine/computation/buildCreatureComputation.js index a5009d2c..a736354c 100644 --- a/app/imports/api/engine/computation/buildCreatureComputation.js +++ b/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'; /** diff --git a/app/imports/api/engine/computation/computeComputation/computeByType.js b/app/imports/api/engine/computation/computeComputation/computeByType.js index b6ccff38..7597b976 100644 --- a/app/imports/api/engine/computation/computeComputation/computeByType.js +++ b/app/imports/api/engine/computation/computeComputation/computeByType.js @@ -2,6 +2,7 @@ import _variable from './computeByType/computeVariable.js'; import action from './computeByType/computeAction.js'; import attribute from './computeByType/computeAttribute.js'; 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 _calculation from './computeByType/computeCalculation.js'; @@ -13,6 +14,7 @@ export default Object.freeze({ attribute, container, skill, + pointBuy, propertySlot, spell: action, }); diff --git a/app/imports/api/engine/computation/computeComputation/computeByType/computePointBuy.js b/app/imports/api/engine/computation/computeComputation/computeByType/computePointBuy.js new file mode 100644 index 00000000..c2cc7606 --- /dev/null +++ b/app/imports/api/engine/computation/computeComputation/computeByType/computePointBuy.js @@ -0,0 +1,53 @@ +import { has } from 'lodash'; +import evaluateCalculation from '../../utility/evaluateCalculation.js'; + +export default function computePointBuy(computation, node) { + const prop = node.data; + const tableMin = prop.min?.value || null; + const tableMax = prop.max?.value || null; + prop.spent = 0; + prop.values?.forEach(row => { + // Clean up added properties + // delete row.tableId; + // delete row.tableName; + // delete row.type; + + row.spent = 0; + if (row.value === undefined) return; + const min = has(row, 'min.value') ? row.min.value : tableMin; + const max = has(row, 'max.value') ? row.max.value : tableMax; + const costFunction = EJSON.clone(row.cost || prop.cost); + if (costFunction) costFunction.parseLevel = 'reduce'; + + // Check min and max + if (min !== null && row.value < min) { + row.value = min; + } + if (max !== null && row.value > max) { + row.value = max; + } + // Evaluate the cost function + if (!costFunction) return; + evaluateCalculation(costFunction, { ...computation.scope, value: row.value }); + // Write calculation errors + costFunction.errors?.forEach(error => { + if (error?.message) { + row.errors = row.errors || []; + error.message = 'Cost calculation error.\n' + error.message; + row.errors.push(error); + } + }); + if (Number.isFinite(costFunction.value)) { + row.spent = costFunction.value; + prop.spent += costFunction.value; + } + }); + prop.pointsLeft = (prop.total?.value || 0) - (prop.spent || 0); + if (prop.spent > prop.total?.value) { + prop.errors = prop.errors || []; + prop.errors.push({ + type: 'pointBuyError', + message: 'Spent more than total points available', + }); + } +} diff --git a/app/imports/api/engine/computation/computeComputation/computeByType/computeSkill.js b/app/imports/api/engine/computation/computeComputation/computeByType/computeSkill.js index 2e79d18a..9243adb4 100644 --- a/app/imports/api/engine/computation/computeComputation/computeByType/computeSkill.js +++ b/app/imports/api/engine/computation/computeComputation/computeByType/computeSkill.js @@ -4,7 +4,7 @@ // by computeVariableAsSkill export default function computeSkill(computation, node){ const prop = node.data; - prop.proficiency = prop.baseProficiency; + prop.proficiency = prop.baseProficiency || 0; let profBonus = computation.scope['proficiencyBonus']?.value || 0; // Multiply the proficiency bonus by the actual proficiency if(prop.proficiency === 0.49){ diff --git a/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/aggregate/aggregateDefinition.js b/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/aggregate/aggregateDefinition.js index 66fbe79a..d665b284 100644 --- a/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/aggregate/aggregateDefinition.js +++ b/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/aggregate/aggregateDefinition.js @@ -8,7 +8,13 @@ export default function aggregateDefinition({node, linkedNode, link}){ // get current defining prop const definingProp = node.data.definingProp; // Find the last defining prop - if (!definingProp || prop.order > definingProp.order){ + if ( + !definingProp || + prop.type !== 'pointBuyRow' && ( + definingProp.type === 'pointBuyRow' || + prop.order > definingProp.order + ) + ) { // override the current defining prop overrideProp(definingProp, node); // set this prop as the new defining prop @@ -18,9 +24,32 @@ export default function aggregateDefinition({node, linkedNode, link}){ } // Aggregate the base value due to the defining properties - const propBaseValue = prop.baseValue?.value; + let propBaseValue = prop.baseValue?.value; + // Point buy rows use prop.value instead of prop.baseValue + if (prop.type === 'pointBuyRow') { + propBaseValue = prop.value; + } if (propBaseValue === undefined) return; + // Store a summary of the definition as a base value effect + node.data.effects = node.data.effects || []; + if (prop.type === 'pointBuyRow') { + node.data.effects.push({ + _id: prop.tableId, + name: prop.tableName, + operation: 'base', + amount: { value: propBaseValue }, + type: 'pointBuy', + }); + } else { + node.data.effects.push({ + _id: prop._id, + name: prop.name, + operation: 'base', + amount: { value: propBaseValue }, + type: prop.type, + }); + } if (node.data.baseValue === undefined || propBaseValue > node.data.baseValue){ node.data.baseValue = propBaseValue; } diff --git a/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/aggregate/aggregateEffect.js b/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/aggregate/aggregateEffect.js index 8cf47d36..3b1b987e 100644 --- a/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/aggregate/aggregateEffect.js +++ b/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/aggregate/aggregateEffect.js @@ -1,3 +1,5 @@ +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 @@ -19,11 +21,23 @@ 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, // ancestors: linkedNode.data.ancestors, }); @@ -32,7 +46,7 @@ export default function aggregateEffect({node, linkedNode, link}){ // 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; + if (typeof result === 'string' || result === undefined) return; // Aggregate the effect based on its operation switch(linkedNode.data.operation){ case 'base': diff --git a/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/computeImplicitVariable.js b/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/computeImplicitVariable.js index 61e081f8..13dcc7f2 100644 --- a/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/computeImplicitVariable.js +++ b/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/computeImplicitVariable.js @@ -7,19 +7,19 @@ import getAggregatorResult from './getAggregatorResult.js'; export default function computeImplicitVariable(node){ const prop = {}; - // Combine damage multipliers - if (node.data.immunity){ - prop.immunity = node.data.immunity; - prop.immunities = node.data.immunities; - } - if (node.data.resistance){ - prop.resistance = node.data.resistance; - prop.resistances = node.data.resistances; - } - if (node.data.vulnerability){ - prop.vulnerability = node.data.vulnerability; - prop.vulnerabilities = node.data.vulnerabilities; - } + // Combine damage multipliers + if (node.data.immunity){ + prop.immunity = node.data.immunity; + prop.immunities = node.data.immunities; + } + if (node.data.resistance){ + prop.resistance = node.data.resistance; + prop.resistances = node.data.resistances; + } + if (node.data.vulnerability){ + prop.vulnerability = node.data.vulnerability; + prop.vulnerabilities = node.data.vulnerabilities; + } const result = getAggregatorResult(node); if (result !== undefined){ diff --git a/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/computeVariableAsSkill.js b/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/computeVariableAsSkill.js index 37b6afdd..01d34101 100644 --- a/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/computeVariableAsSkill.js +++ b/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/computeVariableAsSkill.js @@ -33,6 +33,9 @@ export default function computeVariableAsSkill(computation, node, prop){ const aggregator = node.data.effectAggregator; const aggregatorBase = aggregator?.base || 0; + // Store effects + prop.effects = node.data.effects; + // If there is no aggregator, determine if the prop can hide, then exit if (!aggregator){ prop.hide = statBase === undefined && @@ -71,8 +74,6 @@ export default function computeVariableAsSkill(computation, node, prop){ prop.fail = aggregator.fail; // Rollbonus prop.rollBonuses = aggregator.rollBonus; - // Store effects - prop.effects = node.data.effects; } function aggregateAbilityEffects({computation, skillNode, abilityNode}){ diff --git a/app/imports/api/engine/computation/computeComputation/computeToggles.js b/app/imports/api/engine/computation/computeComputation/computeToggles.js index 3a49fe53..caa310d2 100644 --- a/app/imports/api/engine/computation/computeComputation/computeToggles.js +++ b/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; diff --git a/app/imports/api/engine/computation/utility/getEffectivePropTags.js b/app/imports/api/engine/computation/utility/getEffectivePropTags.js index e3e52bf2..f6fe47e6 100644 --- a/app/imports/api/engine/computation/utility/getEffectivePropTags.js +++ b/app/imports/api/engine/computation/utility/getEffectivePropTags.js @@ -9,8 +9,10 @@ export default function getEffectivePropTags(prop) { } // Tags for some string properties + 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; diff --git a/app/imports/api/icons/Icons.js b/app/imports/api/icons/Icons.js index 286a4bee..072d2467 100644 --- a/app/imports/api/icons/Icons.js +++ b/app/imports/api/icons/Icons.js @@ -7,17 +7,17 @@ import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js'; let Icons = new Mongo.Collection('icons'); let iconsSchema = new SimpleSchema({ - name: { - type: String, + name: { + type: String, unique: true, max: STORAGE_LIMITS.name, index: 1, - }, - description: { - type: String, - optional: true, + }, + description: { + type: String, + optional: true, max: STORAGE_LIMITS.description, - }, + }, tags: { type: Array, optional: true, @@ -38,7 +38,7 @@ if (Meteor.isServer) { Icons._ensureIndex({ 'name': 'text', 'description': 'text', - 'tags': 'text', + 'tags': 'text', }); } @@ -55,15 +55,15 @@ Icons.attachSchema(iconsSchema); // This method does not validate icons against the schema, use wisely; const writeIcons = new ValidatedMethod({ - name: 'icons.write', - validate: null, - run(icons){ + name: 'icons.write', + validate: null, + 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 }); } - } + } }); const findIcons = new ValidatedMethod({ @@ -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: { diff --git a/app/imports/api/library/Libraries.js b/app/imports/api/library/Libraries.js index 95444bc3..696f0001 100644 --- a/app/imports/api/library/Libraries.js +++ b/app/imports/api/library/Libraries.js @@ -20,7 +20,7 @@ import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js'; let Libraries = new Mongo.Collection('libraries'); let LibrarySchema = new SimpleSchema({ - name: { + name: { type: String, max: STORAGE_LIMITS.name, }, @@ -39,95 +39,95 @@ export default Libraries; const insertLibrary = new ValidatedMethod({ name: 'libraries.insert', - mixins: [ - simpleSchemaMixin, + mixins: [ + simpleSchemaMixin, ], schema: LibrarySchema.omit('owner'), run(library) { if (!this.userId) { throw new Meteor.Error('Libraries.methods.insert.denied', - 'You need to be logged in to insert a library'); + '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`); + `The ${tier.name} tier does not allow you to insert a library`); } library.owner = this.userId; - return Libraries.insert(library); + return Libraries.insert(library); }, }); const updateLibraryName = new ValidatedMethod({ - name: 'libraries.updateName', - validate: new SimpleSchema({ - _id: { - type: String, - regEx: SimpleSchema.RegEx.id - }, - name: { - type: String, - }, - }).validator(), + name: 'libraries.updateName', + validate: new SimpleSchema({ + _id: { + type: String, + regEx: SimpleSchema.RegEx.id + }, + name: { + type: String, + }, + }).validator(), mixins: [RateLimiterMixin], rateLimit: { numRequests: 5, timeInterval: 5000, }, - run({_id, name}){ - let library = Libraries.findOne(_id); - assertEditPermission(library, this.userId); - Libraries.update(_id, {$set: {name}}); - }, + run({ _id, name }) { + let library = Libraries.findOne(_id); + assertEditPermission(library, this.userId); + Libraries.update(_id, { $set: { name } }); + }, }); const updateLibraryDescription = new ValidatedMethod({ - name: 'libraries.updateDescription', - validate: new SimpleSchema({ - _id: { - type: String, - regEx: SimpleSchema.RegEx.id - }, - description: { - type: String, - }, - }).validator(), + name: 'libraries.updateDescription', + validate: new SimpleSchema({ + _id: { + type: String, + regEx: SimpleSchema.RegEx.id + }, + description: { + type: String, + }, + }).validator(), mixins: [RateLimiterMixin], rateLimit: { numRequests: 5, timeInterval: 5000, }, - run({_id, description}){ - let library = Libraries.findOne(_id); - assertEditPermission(library, this.userId); - Libraries.update(_id, {$set: {description}}); - }, + run({ _id, description }) { + let library = Libraries.findOne(_id); + assertEditPermission(library, this.userId); + Libraries.update(_id, { $set: { description } }); + }, }); const removeLibrary = new ValidatedMethod({ - name: 'libraries.remove', - validate: new SimpleSchema({ - _id: { - type: String, - regEx: SimpleSchema.RegEx.id - }, - }).validator(), + name: 'libraries.remove', + validate: new SimpleSchema({ + _id: { + type: String, + regEx: SimpleSchema.RegEx.id + }, + }).validator(), mixins: [RateLimiterMixin], rateLimit: { numRequests: 5, timeInterval: 5000, }, - run({_id}){ - let library = Libraries.findOne(_id); - assertOwnership(library, this.userId); + run({ _id }) { + let library = Libraries.findOne(_id); + assertOwnership(library, this.userId); this.unblock(); removeLibaryWork(_id) - } + } }); -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 }; diff --git a/app/imports/api/library/LibraryNodes.js b/app/imports/api/library/LibraryNodes.js index 283a8a68..50d97cd3 100644 --- a/app/imports/api/library/LibraryNodes.js +++ b/app/imports/api/library/LibraryNodes.js @@ -23,28 +23,28 @@ let LibraryNodeSchema = new SimpleSchema({ type: String, regEx: SimpleSchema.RegEx.Id, }, - type: { + type: { type: String, allowedValues: Object.keys(propertySchemasIndex), }, - tags: { - type: Array, - defaultValue: [], + tags: { + type: Array, + defaultValue: [], maxCount: STORAGE_LIMITS.tagCount, - }, - 'tags.$': { - type: String, + }, + 'tags.$': { + type: String, max: STORAGE_LIMITS.tagLength, - }, + }, libraryTags: { - type: Array, - defaultValue: [], + type: Array, + defaultValue: [], maxCount: STORAGE_LIMITS.tagCount, - }, - 'libraryTags.$': { - type: String, + }, + 'libraryTags.$': { + type: String, max: STORAGE_LIMITS.tagLength, - }, + }, icon: { type: storedIconsSchema, optional: true, @@ -56,37 +56,37 @@ let LibraryNodeSchema = new SimpleSchema({ if (Meteor.isServer) { LibraryNodes._ensureIndex({ 'name': 'text', - 'tags': 'text', + 'tags': 'text', }); } -for (let key in propertySchemasIndex){ - let schema = new SimpleSchema({}); - schema.extend(LibraryNodeSchema); +for (let key in propertySchemasIndex) { + let schema = new SimpleSchema({}); + schema.extend(LibraryNodeSchema); schema.extend(ColorSchema); - schema.extend(propertySchemasIndex[key]); - schema.extend(ChildSchema); - schema.extend(SoftRemovableSchema); - LibraryNodes.attachSchema(schema, { - selector: {type: key} - }); + schema.extend(propertySchemasIndex[key]); + schema.extend(ChildSchema); + schema.extend(SoftRemovableSchema); + LibraryNodes.attachSchema(schema, { + 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); } const insertNode = new ValidatedMethod({ name: 'libraryNodes.insert', - validate: null, + validate: null, mixins: [RateLimiterMixin], rateLimit: { numRequests: 5, @@ -95,8 +95,8 @@ const insertNode = new ValidatedMethod({ run(libraryNode) { delete libraryNode._id; assertNodeEditPermission(libraryNode, this.userId); - let nodeId = LibraryNodes.insert(libraryNode); - if (libraryNode.type == 'reference'){ + let nodeId = LibraryNodes.insert(libraryNode); + if (libraryNode.type == 'reference') { libraryNode._id = nodeId; updateReferenceNodeWork(libraryNode, this.userId); } @@ -106,37 +106,37 @@ const insertNode = new ValidatedMethod({ const updateLibraryNode = new ValidatedMethod({ name: 'libraryNodes.update', - validate({_id, path}){ - if (!_id) return false; - // We cannot change these fields with a simple update - switch (path[0]){ - case 'type': + validate({ _id, path }) { + if (!_id) return false; + // We cannot change these fields with a simple update + switch (path[0]) { + case 'type': case 'order': case 'parent': case 'ancestors': - return false; - } + return false; + } }, mixins: [RateLimiterMixin], rateLimit: { 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){ - modifier = {$unset: {[pathString]: 1}}; + if (value === null || value === undefined) { + modifier = { $unset: { [pathString]: 1 } }; } else { - modifier = {$set: {[pathString]: value}}; + modifier = { $set: { [pathString]: value } }; } - let numUpdated = LibraryNodes.update(_id, modifier, { - selector: {type: node.type}, - }); - if (node.type == 'reference'){ + let numUpdated = LibraryNodes.update(_id, modifier, { + selector: { type: node.type }, + }); + if (node.type == 'reference') { node = LibraryNodes.findOne(_id); updateReferenceNodeWork(node, this.userId); } @@ -145,87 +145,87 @@ const updateLibraryNode = new ValidatedMethod({ }); const pushToLibraryNode = new ValidatedMethod({ - name: 'libraryNodes.push', - validate: null, + name: 'libraryNodes.push', + validate: null, mixins: [RateLimiterMixin], rateLimit: { numRequests: 5, timeInterval: 5000, }, - run({_id, path, value}){ - let node = LibraryNodes.findOne(_id); + run({ _id, path, value }) { + let node = LibraryNodes.findOne(_id); assertNodeEditPermission(node, this.userId); - return LibraryNodes.update(_id, { - $push: {[path.join('.')]: value}, - }, { - selector: {type: node.type}, - }); - } + return LibraryNodes.update(_id, { + $push: { [path.join('.')]: value }, + }, { + selector: { type: node.type }, + }); + } }); const pullFromLibraryNode = new ValidatedMethod({ - name: 'libraryNodes.pull', - validate: null, + name: 'libraryNodes.pull', + validate: null, mixins: [RateLimiterMixin], rateLimit: { numRequests: 5, timeInterval: 5000, }, - run({_id, path, itemId}){ - let node = LibraryNodes.findOne(_id); + run({ _id, path, itemId }) { + let node = LibraryNodes.findOne(_id); assertNodeEditPermission(node, this.userId); - return LibraryNodes.update(_id, { - $pull: {[path.join('.')]: {_id: itemId}}, - }, { - selector: {type: node.type}, - getAutoValues: false, - }); - } + return LibraryNodes.update(_id, { + $pull: { [path.join('.')]: { _id: itemId } }, + }, { + selector: { type: node.type }, + getAutoValues: false, + }); + } }); const softRemoveLibraryNode = new ValidatedMethod({ - name: 'libraryNodes.softRemove', - validate: new SimpleSchema({ - _id: SimpleSchema.RegEx.Id - }).validator(), + name: 'libraryNodes.softRemove', + validate: new SimpleSchema({ + _id: SimpleSchema.RegEx.Id + }).validator(), mixins: [RateLimiterMixin], rateLimit: { numRequests: 5, timeInterval: 5000, }, - run({_id}){ - let node = LibraryNodes.findOne(_id); + run({ _id }) { + let node = LibraryNodes.findOne(_id); assertNodeEditPermission(node, this.userId); - softRemove({_id, collection: LibraryNodes}); - } + softRemove({ _id, collection: LibraryNodes }); + } }); const restoreLibraryNode = new ValidatedMethod({ - name: 'libraryNodes.restore', - validate: new SimpleSchema({ - _id: SimpleSchema.RegEx.Id - }).validator(), + name: 'libraryNodes.restore', + validate: new SimpleSchema({ + _id: SimpleSchema.RegEx.Id + }).validator(), mixins: [RateLimiterMixin], rateLimit: { 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 }); + } }); export default LibraryNodes; export { - LibraryNodeSchema, - insertNode, - updateLibraryNode, - pullFromLibraryNode, - pushToLibraryNode, - softRemoveLibraryNode, + LibraryNodeSchema, + insertNode, + updateLibraryNode, + pullFromLibraryNode, + pushToLibraryNode, + softRemoveLibraryNode, restoreLibraryNode, }; diff --git a/app/imports/api/library/methods/duplicateLibraryNode.js b/app/imports/api/library/methods/duplicateLibraryNode.js index 4da84997..107f3c6b 100644 --- a/app/imports/api/library/methods/duplicateLibraryNode.js +++ b/app/imports/api/library/methods/duplicateLibraryNode.js @@ -4,13 +4,13 @@ import { RateLimiterMixin } from 'ddp-rate-limiter-mixin'; import LibraryNodes from '/imports/api/library/LibraryNodes.js'; import { assertDocEditPermission } from '/imports/api/sharing/sharingPermissions.js'; import { - setLineageOfDocs, - renewDocIds + setLineageOfDocs, + renewDocIds } 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 @@ -20,7 +20,7 @@ const DUPLICATE_CHILDREN_LIMIT = 50; const duplicateLibraryNode = new ValidatedMethod({ name: 'libraryNodes.duplicate', - validate: new SimpleSchema({ + validate: new SimpleSchema({ _id: { type: String, regEx: SimpleSchema.RegEx.Id, @@ -31,7 +31,7 @@ const duplicateLibraryNode = new ValidatedMethod({ numRequests: 5, timeInterval: 5000, }, - run({_id}) { + run({ _id }) { let libraryNode = LibraryNodes.findOne(_id); assertDocEditPermission(libraryNode, this.userId); @@ -40,16 +40,16 @@ const duplicateLibraryNode = new ValidatedMethod({ libraryNode._id = libraryNodeId; let nodes = LibraryNodes.find({ - 'ancestors.id': _id, - removed: {$ne: true}, - }, { + 'ancestors.id': _id, + 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`, }); @@ -58,21 +58,21 @@ const duplicateLibraryNode = new ValidatedMethod({ // re-map all the ancestors setLineageOfDocs({ - docArray: nodes, - newAncestry : [ + docArray: nodes, + 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; - LibraryNodes.batchInsert([libraryNode, ...nodes]); + LibraryNodes.batchInsert([libraryNode, ...nodes]); // Tree structure changed by inserts, reorder the tree reorderDocs({ diff --git a/app/imports/api/parenting/ChildSchema.js b/app/imports/api/parenting/ChildSchema.js index c2a6bc69..f4787bcc 100644 --- a/app/imports/api/parenting/ChildSchema.js +++ b/app/imports/api/parenting/ChildSchema.js @@ -22,7 +22,7 @@ let ChildSchema = new SimpleSchema({ order: { type: Number, }, - parent: { + parent: { type: RefSchema, optional: true, }, diff --git a/app/imports/api/parenting/SoftRemovableSchema.js b/app/imports/api/parenting/SoftRemovableSchema.js index 8c120553..54c2f92c 100644 --- a/app/imports/api/parenting/SoftRemovableSchema.js +++ b/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, diff --git a/app/imports/api/properties/Actions.js b/app/imports/api/properties/Actions.js index 53e57afa..1ff4d6fd 100644 --- a/app/imports/api/properties/Actions.js +++ b/app/imports/api/properties/Actions.js @@ -114,6 +114,11 @@ let ActionSchema = createPropertySchema({ type: 'fieldToCompute', optional: true, }, + // Prevent the property from showing up in the log + silent: { + type: Boolean, + optional: true, + }, }); const ComputedOnlyActionSchema = createPropertySchema({ diff --git a/app/imports/api/properties/Adjustments.js b/app/imports/api/properties/Adjustments.js index 49c1b248..6b2607f5 100644 --- a/app/imports/api/properties/Adjustments.js +++ b/app/imports/api/properties/Adjustments.js @@ -3,7 +3,7 @@ import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js'; import createPropertySchema from '/imports/api/properties/subSchemas/createPropertySchema.js'; const AdjustmentSchema = createPropertySchema({ - // The roll that determines how much to change the attribute + // The roll that determines how much to change the attribute // This can be simplified, but should only compute when activated amount: { type: 'fieldToCompute', @@ -11,26 +11,31 @@ const AdjustmentSchema = createPropertySchema({ optional: true, defaultValue: 1, }, - // Who this adjustment applies to - target: { - type: String, + // Who this adjustment applies to + target: { + type: String, defaultValue: 'target', - allowedValues: [ + allowedValues: [ 'self', 'target', ], - }, - // The stat this rolls applies to - stat: { - type: String, + }, + // The stat this rolls applies to + stat: { + type: String, optional: true, max: STORAGE_LIMITS.variableName, - }, + }, operation: { type: String, allowedValues: ['set', 'increment'], defaultValue: 'increment', }, + // Prevent the property from showing up in the log + silent: { + type: Boolean, + optional: true, + }, }); const ComputedOnlyAdjustmentSchema = createPropertySchema({ diff --git a/app/imports/api/properties/Attributes.js b/app/imports/api/properties/Attributes.js index 38721928..d486d5f9 100644 --- a/app/imports/api/properties/Attributes.js +++ b/app/imports/api/properties/Attributes.js @@ -8,34 +8,34 @@ import createPropertySchema from '/imports/api/properties/subSchemas/createPrope */ let AttributeSchema = createPropertySchema({ name: { - type: String, + type: String, optional: true, max: STORAGE_LIMITS.name, - }, + }, // The technical, lowercase, single-word name used in formulae variableName: { type: String, optional: true, - regEx: VARIABLE_NAME_REGEX, + regEx: VARIABLE_NAME_REGEX, min: 2, max: STORAGE_LIMITS.variableName, }, - // How it is displayed and computed is determined by type + // How it is displayed and computed is determined by type attributeType: { type: String, allowedValues: [ 'ability', //Strength, Dex, Con, etc. 'stat', // Speed, Armor Class - 'modifier', // Proficiency Bonus, displayed as +x + 'modifier', // Proficiency Bonus, displayed as +x 'hitDice', // d12 hit dice 'healthBar', // Hitpoints, Temporary Hitpoints, can take damage - 'bar', // Displayed as a health bar, can't take damage + 'bar', // Displayed as a health bar, can't take damage 'resource', // Rages, sorcery points 'spellSlot', // Level 1, 2, 3... spell slots 'utility', // Aren't displayed, Jump height, Carry capacity ], defaultValue: 'stat', - index: 1, + index: 1, }, // For type hitDice, the size needs to be stored separately hitDiceSize: { @@ -46,19 +46,19 @@ let AttributeSchema = createPropertySchema({ // For type spellSlot, the level needs to be stored separately spellSlotLevel: { type: 'fieldToCompute', - optional: true, + optional: true, }, // For type healthBar midColor, and lowColor can be set separately from the // property's color, which is used as the undamaged color 'healthBarColorMid': { - type: String, - regEx: /^#([a-f0-9]{3}){1,2}\b$/i, - optional: true, + type: String, + regEx: /^#([a-f0-9]{3}){1,2}\b$/i, + optional: true, }, 'healthBarColorLow': { - type: String, - regEx: /^#([a-f0-9]{3}){1,2}\b$/i, - optional: true, + type: String, + regEx: /^#([a-f0-9]{3}){1,2}\b$/i, + optional: true, }, // Control how the health bar takes damage or healing healthBarNoDamage: { @@ -68,7 +68,7 @@ let AttributeSchema = createPropertySchema({ healthBarNoHealing: { type: Boolean, optional: true, - }, + }, healthBarDamageOrder: { type: SimpleSchema.Integer, optional: true, @@ -77,17 +77,17 @@ let AttributeSchema = createPropertySchema({ type: SimpleSchema.Integer, optional: true, }, - // The starting value, before effects - baseValue: { + // The starting value, before effects + baseValue: { type: 'fieldToCompute', - optional: true, - }, + optional: true, + }, // Description of what the attribute is used for description: { type: 'inlineCalculationFieldToCompute', - optional: true, - }, - // The damage done to the attribute, should always compute as positive + optional: true, + }, + // The damage done to the attribute, should always compute as positive damage: { type: SimpleSchema.Integer, optional: true, @@ -107,7 +107,7 @@ let AttributeSchema = createPropertySchema({ type: Boolean, optional: true, }, - // Automatically zero the adjustment on these conditions + // Automatically zero the adjustment on these conditions reset: { type: String, optional: true, @@ -126,9 +126,9 @@ let ComputedOnlyAttributeSchema = createPropertySchema({ }, spellSlotLevel: { type: 'computedOnlyField', - optional: true, + optional: true, }, - // The computed value of the attribute + // The computed value of the attribute total: { type: SimpleSchema.oneOf(Number, String, Boolean), optional: true, @@ -137,27 +137,27 @@ let ComputedOnlyAttributeSchema = createPropertySchema({ // The computed value of the attribute minus the damage value: { type: SimpleSchema.oneOf(Number, String, Boolean), - defaultValue: 0, + defaultValue: 0, optional: true, removeBeforeCompute: true, }, - // The computed modifier, provided the attribute type is `ability` - modifier: { - type: SimpleSchema.Integer, - optional: true, + // The computed modifier, provided the attribute type is `ability` + modifier: { + type: SimpleSchema.Integer, + optional: true, removeBeforeCompute: true, - }, + }, // Attributes with proficiency grant it to all skills based on the attribute proficiency: { - type: Number, + type: Number, allowedValues: [0, 0.49, 0.5, 1, 2], - optional: true, + optional: true, removeBeforeCompute: true, - }, + }, // The computed creature constitution modifier for hit dice constitutionMod: { type: Number, - optional: true, + optional: true, removeBeforeCompute: true, }, // Should this attribute hide @@ -176,6 +176,7 @@ let ComputedOnlyAttributeSchema = createPropertySchema({ effects: { type: Array, optional: true, + removeBeforeCompute: true, }, 'effects.$': { type: Object, diff --git a/app/imports/api/properties/Branches.js b/app/imports/api/properties/Branches.js index 952c7715..73716eb6 100644 --- a/app/imports/api/properties/Branches.js +++ b/app/imports/api/properties/Branches.js @@ -3,8 +3,8 @@ import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js'; import createPropertySchema from '/imports/api/properties/subSchemas/createPropertySchema.js'; let BranchSchema = createPropertySchema({ - branchType: { - type: String, + branchType: { + type: String, allowedValues: [ // Uses the condition field to determine whether to apply children 'if', @@ -26,7 +26,7 @@ let BranchSchema = createPropertySchema({ //'option', ], defaultValue: 'if', - }, + }, text: { type: String, optional: true, @@ -37,6 +37,11 @@ let BranchSchema = createPropertySchema({ optional: true, parseLevel: 'compile', }, + // Prevent the property from showing up in the log + silent: { + type: Boolean, + optional: true, + }, }); let ComputedOnlyBranchSchema = createPropertySchema({ diff --git a/app/imports/api/properties/BuffRemovers.js b/app/imports/api/properties/BuffRemovers.js index 8752f750..b96466cb 100644 --- a/app/imports/api/properties/BuffRemovers.js +++ b/app/imports/api/properties/BuffRemovers.js @@ -4,31 +4,31 @@ import createPropertySchema from '/imports/api/properties/subSchemas/createPrope let BuffRemoverSchema = createPropertySchema({ name: { - type: String, - optional: true, + type: String, + optional: true, max: STORAGE_LIMITS.name, - }, - // This will remove just the nearest ancestor buff - targetParentBuff: { - type: Boolean, - optional: true, - }, - // The following only applies when not targeting the parent buff - // Which character to remove buffs from - target: { - type: String, - allowedValues: [ + }, + // This will remove just the nearest ancestor buff + targetParentBuff: { + type: Boolean, + optional: true, + }, + // The following only applies when not targeting the parent buff + // Which character to remove buffs from + target: { + type: String, + allowedValues: [ 'self', 'target', ], - defaultValue: 'target', - }, - // remove 1 or remove all - removeAll: { - type: Boolean, + defaultValue: 'target', + }, + // remove 1 or remove all + removeAll: { + type: Boolean, optional: true, defaultValue: true, - }, + }, // Buffs to remove based on tags: targetTags: { type: Array, @@ -50,7 +50,7 @@ let BuffRemoverSchema = createPropertySchema({ 'extraTags.$._id': { type: String, regEx: SimpleSchema.RegEx.Id, - autoValue(){ + autoValue() { if (!this.isSet) return Random.id(); } }, @@ -68,6 +68,11 @@ let BuffRemoverSchema = createPropertySchema({ type: String, max: STORAGE_LIMITS.tagLength, }, + // Prevent the property from showing up in the log + silent: { + type: Boolean, + optional: true, + }, }); let ComputedOnlyBuffRemoverSchema = createPropertySchema({}); diff --git a/app/imports/api/properties/Buffs.js b/app/imports/api/properties/Buffs.js index dac2d7ff..386c402b 100644 --- a/app/imports/api/properties/Buffs.js +++ b/app/imports/api/properties/Buffs.js @@ -4,64 +4,74 @@ import createPropertySchema from '/imports/api/properties/subSchemas/createPrope let BuffSchema = createPropertySchema({ name: { - type: String, - optional: true, + type: String, + optional: true, max: STORAGE_LIMITS.name, - }, - description: { - type: 'inlineCalculationFieldToCompute', - optional: true, - }, - hideRemoveButton: { - type: Boolean, - optional: true, - }, + }, + description: { + type: 'inlineCalculationFieldToCompute', + optional: true, + }, + hideRemoveButton: { + type: Boolean, + optional: true, + }, // How many rounds this buff lasts - duration: { - type: 'fieldToCompute', - optional: true, - }, + duration: { + type: 'fieldToCompute', + optional: true, + }, target: { - type: String, - allowedValues: [ + type: String, + allowedValues: [ 'self', 'target', ], - defaultValue: 'target', - }, + defaultValue: 'target', + }, + // Prevent the property from showing up in the log + silent: { + type: Boolean, + optional: true, + }, + // Prevent the children from being crystalized + skipCrystalization: { + type: Boolean, + optional: true, + }, }); let ComputedOnlyBuffSchema = createPropertySchema({ - description: { - type: 'computedOnlyInlineCalculationField', - optional: true, - max: STORAGE_LIMITS.description, - }, - duration: { - type: 'computedOnlyField', - optional: true, - }, - durationSpent: { - type: Number, - optional: true, - min: 0, - }, - appliedBy: { - type: Object, + description: { + type: 'computedOnlyInlineCalculationField', optional: true, - }, - 'appliedBy.name': { - type: String, + max: STORAGE_LIMITS.description, + }, + duration: { + type: 'computedOnlyField', + optional: true, + }, + durationSpent: { + type: Number, + optional: true, + min: 0, + }, + appliedBy: { + type: Object, + optional: true, + }, + 'appliedBy.name': { + type: String, max: STORAGE_LIMITS.name, - }, - 'appliedBy.id': { - type: String, - regEx: SimpleSchema.RegEx.Id, - }, - 'appliedBy.collection': { - type: String, + }, + 'appliedBy.id': { + type: String, + regEx: SimpleSchema.RegEx.Id, + }, + 'appliedBy.collection': { + type: String, max: STORAGE_LIMITS.collectionName, - }, + }, }); const ComputedBuffSchema = new SimpleSchema() diff --git a/app/imports/api/properties/ClassLevels.js b/app/imports/api/properties/ClassLevels.js index f0600917..bbd76d58 100644 --- a/app/imports/api/properties/ClassLevels.js +++ b/app/imports/api/properties/ClassLevels.js @@ -4,26 +4,26 @@ import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js'; import createPropertySchema from '/imports/api/properties/subSchemas/createPropertySchema.js'; const ClassLevelSchema = createPropertySchema({ - name: { - type: String, - optional: true, + name: { + type: String, + optional: true, max: STORAGE_LIMITS.name, - }, - description: { - type: 'inlineCalculationFieldToCompute', - optional: true, - }, - // The name of this class level's variable - variableName: { + }, + description: { + type: 'inlineCalculationFieldToCompute', + optional: true, + }, + // The name of this class level's variable + variableName: { type: String, min: 2, - regEx: VARIABLE_NAME_REGEX, + regEx: VARIABLE_NAME_REGEX, max: STORAGE_LIMITS.variableName, optional: true, }, - level: { + level: { type: SimpleSchema.Integer, - defaultValue: 1, + defaultValue: 1, max: STORAGE_LIMITS.levelMax, }, // Filters out of UI if condition isn't met, but isn't otherwise enforced @@ -34,7 +34,7 @@ const ClassLevelSchema = createPropertySchema({ }, }); -const ComputedOnlyClassLevelSchema = createPropertySchema({ +const ComputedOnlyClassLevelSchema = createPropertySchema({ description: { type: 'computedOnlyInlineCalculationField', optional: true, diff --git a/app/imports/api/properties/Constants.js b/app/imports/api/properties/Constants.js index 0995ccd9..ded0f090 100644 --- a/app/imports/api/properties/Constants.js +++ b/app/imports/api/properties/Constants.js @@ -13,29 +13,29 @@ import resolve, { Context, traverse } from '/imports/parser/resolve.js'; */ let ConstantSchema = new SimpleSchema({ name: { - type: String, - optional: true, + type: String, + optional: true, max: STORAGE_LIMITS.name, - }, + }, // The technical, lowercase, single-word name used in formulae variableName: { type: String, - regEx: VARIABLE_NAME_REGEX, + regEx: VARIABLE_NAME_REGEX, min: 2, defaultValue: 'newConstant', max: STORAGE_LIMITS.variableName, }, - // The input value to be parsed, must return a constant node or an array + // The input value to be parsed, must return a constant node or an array // of constant nodes to be valid - calculation: { - type: String, - optional: true, + calculation: { + type: String, + optional: true, max: STORAGE_LIMITS.calculation, - }, + }, 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){ - return {result: string, context}; + if (!string) { + 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}; - let {result} = resolve(fn, node, {/*empty scope*/}, context); - return {result, context} + if (!node) return { context }; + let { result } = resolve(fn, node, {/*empty scope*/ }, context); + return { result, context } } const ComputedOnlyConstantSchema = new SimpleSchema({}); diff --git a/app/imports/api/properties/Containers.js b/app/imports/api/properties/Containers.js index 402a3e83..6936bd15 100644 --- a/app/imports/api/properties/Containers.js +++ b/app/imports/api/properties/Containers.js @@ -3,61 +3,61 @@ import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js'; import createPropertySchema from '/imports/api/properties/subSchemas/createPropertySchema.js'; let ContainerSchema = createPropertySchema({ - name: { - type: String, - optional: true, - trim: false, + name: { + type: String, + optional: true, + trim: false, max: STORAGE_LIMITS.name, - }, - carried: { - type: Boolean, - defaultValue: true, - optional: true, - }, - contentsWeightless: { - type: Boolean, - optional: true, - }, - weight: { - type: Number, - min: 0, + }, + carried: { + type: Boolean, + defaultValue: true, optional: true, - }, - value: { - type: Number, - min: 0, + }, + contentsWeightless: { + type: Boolean, optional: true, - }, - description: { - type: 'inlineCalculationFieldToCompute', - optional: true, - }, + }, + weight: { + type: Number, + min: 0, + optional: true, + }, + value: { + type: Number, + min: 0, + optional: true, + }, + description: { + type: 'inlineCalculationFieldToCompute', + optional: true, + }, }); const ComputedOnlyContainerSchema = createPropertySchema({ description: { - type: 'computedOnlyInlineCalculationField', - optional: true, - }, + type: 'computedOnlyInlineCalculationField', + 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, @@ -65,7 +65,7 @@ const ComputedOnlyContainerSchema = createPropertySchema({ }); const ComputedContainerSchema = new SimpleSchema() - .extend(ComputedOnlyContainerSchema) - .extend(ContainerSchema); + .extend(ComputedOnlyContainerSchema) + .extend(ContainerSchema); export { ContainerSchema, ComputedOnlyContainerSchema, ComputedContainerSchema }; diff --git a/app/imports/api/properties/DamageMultipliers.js b/app/imports/api/properties/DamageMultipliers.js index c88c4cbe..3c75fbbf 100644 --- a/app/imports/api/properties/DamageMultipliers.js +++ b/app/imports/api/properties/DamageMultipliers.js @@ -8,10 +8,10 @@ import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js'; */ let DamageMultiplierSchema = new SimpleSchema({ name: { - type: String, - optional: true, + type: String, + optional: true, max: STORAGE_LIMITS.name, - }, + }, damageTypes: { type: Array, defaultValue: [], @@ -23,11 +23,11 @@ let DamageMultiplierSchema = new SimpleSchema({ max: STORAGE_LIMITS.calculation, regEx: VARIABLE_NAME_REGEX, }, - // The value of the damage multiplier - value: { + // The value of the damage multiplier + value: { type: Number, - defaultValue: 0.5, - allowedValues: [0, 0.5, 2], + defaultValue: 0.5, + allowedValues: [0, 0.5, 2], }, // Tags which bypass this multiplier (OR) excludeTags: { diff --git a/app/imports/api/properties/Damages.js b/app/imports/api/properties/Damages.js index 85cafee0..190dd4b5 100644 --- a/app/imports/api/properties/Damages.js +++ b/app/imports/api/properties/Damages.js @@ -4,7 +4,7 @@ import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js'; import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js'; const DamageSchema = createPropertySchema({ - // The roll that determines how much to damage the attribute + // The roll that determines how much to damage the attribute // This can be simplified, but only computed when applied amount: { type: 'fieldToCompute', @@ -12,21 +12,26 @@ const DamageSchema = createPropertySchema({ defaultValue: '1d8 + strength.modifier', parseLevel: 'compile', }, - // Who this damage applies to - target: { - type: String, + // Who this damage applies to + target: { + type: String, defaultValue: 'target', - allowedValues: [ + allowedValues: [ 'self', 'target', ], - }, - damageType: { - type: String, + }, + damageType: { + type: String, max: STORAGE_LIMITS.calculation, - defaultValue: 'slashing', + defaultValue: 'slashing', regEx: VARIABLE_NAME_REGEX, - }, + }, + // Prevent the property from showing up in the log + silent: { + type: Boolean, + optional: true, + }, }); const ComputedOnlyDamageSchema = createPropertySchema({ diff --git a/app/imports/api/properties/Features.js b/app/imports/api/properties/Features.js index 0abe8be9..91fc95b6 100644 --- a/app/imports/api/properties/Features.js +++ b/app/imports/api/properties/Features.js @@ -3,19 +3,19 @@ import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js'; import createPropertySchema from '/imports/api/properties/subSchemas/createPropertySchema.js'; let FeatureSchema = createPropertySchema({ - name: { - type: String, + name: { + type: String, max: STORAGE_LIMITS.name, optional: true, - }, - summary: { - type: 'inlineCalculationFieldToCompute', - optional: true, - }, + }, + summary: { + type: 'inlineCalculationFieldToCompute', + optional: true, + }, description: { - type: 'inlineCalculationFieldToCompute', - optional: true, - }, + type: 'inlineCalculationFieldToCompute', + optional: true, + }, }); let ComputedOnlyFeatureSchema = createPropertySchema({ diff --git a/app/imports/api/properties/Items.js b/app/imports/api/properties/Items.js index 373a6054..a328cfcf 100644 --- a/app/imports/api/properties/Items.js +++ b/app/imports/api/properties/Items.js @@ -3,58 +3,58 @@ import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js'; import createPropertySchema from '/imports/api/properties/subSchemas/createPropertySchema.js'; const ItemSchema = createPropertySchema({ - name: { - type: String, - optional: true, + name: { + type: String, + optional: true, max: STORAGE_LIMITS.name, - }, - // Plural name of the item, if there is more than one - plural: { - type: String, - optional: true, + }, + // Plural name of the item, if there is more than one + plural: { + type: String, + optional: true, max: STORAGE_LIMITS.name, - }, + }, description: { - type: 'inlineCalculationFieldToCompute', - optional: true, - }, - // Number currently held - quantity: { - type: SimpleSchema.Integer, - min: 0, - defaultValue: 1 - }, - // Weight per item in the stack - weight: { - type: Number, - min: 0, + type: 'inlineCalculationFieldToCompute', optional: true, - }, - // Value per item in the stack, in gold pieces - value: { - type: Number, - min: 0, + }, + // Number currently held + quantity: { + type: SimpleSchema.Integer, + min: 0, + defaultValue: 1 + }, + // Weight per item in the stack + weight: { + type: Number, + min: 0, optional: true, - }, - // If this item is equipped, it requires attunement - requiresAttunement: { - type: Boolean, - optional: true, - }, + }, + // Value per item in the stack, in gold pieces + value: { + type: Number, + min: 0, + optional: true, + }, + // If this item is equipped, it requires attunement + requiresAttunement: { + type: Boolean, + optional: true, + }, attuned: { - type: Boolean, - optional: true, - }, - // Show increment/decrement buttons in item lists - showIncrement: { - type: Boolean, - optional: true, - }, - // Unequipped items shouldn't affect creature stats - equipped: { - type: Boolean, - defaultValue: false, - }, + type: Boolean, + optional: true, + }, + // Show increment/decrement buttons in item lists + showIncrement: { + type: Boolean, + optional: true, + }, + // Unequipped items shouldn't affect creature stats + equipped: { + type: Boolean, + defaultValue: false, + }, }); let ComputedOnlyItemSchema = createPropertySchema({ diff --git a/app/imports/api/properties/Notes.js b/app/imports/api/properties/Notes.js index dd76d906..1e738b08 100644 --- a/app/imports/api/properties/Notes.js +++ b/app/imports/api/properties/Notes.js @@ -3,19 +3,19 @@ import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js'; import createPropertySchema from '/imports/api/properties/subSchemas/createPropertySchema.js'; let NoteSchema = createPropertySchema({ - name: { - type: String, - optional: true, + name: { + type: String, + optional: true, max: STORAGE_LIMITS.name, - }, - summary: { - type: 'inlineCalculationFieldToCompute', - optional: true, - }, + }, + summary: { + type: 'inlineCalculationFieldToCompute', + optional: true, + }, description: { - type: 'inlineCalculationFieldToCompute', - optional: true, - }, + type: 'inlineCalculationFieldToCompute', + optional: true, + }, }); let ComputedOnlyNoteSchema = createPropertySchema({ diff --git a/app/imports/api/properties/PointBuys.js b/app/imports/api/properties/PointBuys.js index 95cc1634..db20911a 100644 --- a/app/imports/api/properties/PointBuys.js +++ b/app/imports/api/properties/PointBuys.js @@ -2,6 +2,7 @@ import SimpleSchema from 'simpl-schema'; import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js'; import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js'; import createPropertySchema from '/imports/api/properties/subSchemas/createPropertySchema.js'; +import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js'; /* * PointBuys are reason-value attached to skills and abilities @@ -13,13 +14,6 @@ let PointBuySchema = createPropertySchema({ optional: true, max: STORAGE_LIMITS.name, }, - variableName: { - type: String, - optional: true, - regEx: VARIABLE_NAME_REGEX, - min: 2, - max: STORAGE_LIMITS.variableName, - }, ignored: { type: Boolean, optional: true, @@ -27,10 +21,18 @@ let PointBuySchema = createPropertySchema({ 'values': { type: Array, defaultValue: [], + maxCount: STORAGE_LIMITS.pointBuyRowsCount, }, 'values.$': { type: Object, }, + 'values.$._id': { + type: String, + regEx: SimpleSchema.RegEx.Id, + autoValue(){ + if (!this.isSet) return Random.id(); + } + }, 'values.$.name': { type: String, optional: true, @@ -47,6 +49,18 @@ let PointBuySchema = createPropertySchema({ type: Number, optional: true, }, + 'values.$.min': { + type: 'fieldToCompute', + optional: true, + }, + 'values.$.max': { + type: 'fieldToCompute', + optional: true, + }, + 'values.$.cost': { + type: 'fieldToCompute', + optional: true, + }, min: { type: 'fieldToCompute', optional: true, @@ -62,6 +76,7 @@ let PointBuySchema = createPropertySchema({ cost: { type: 'fieldToCompute', optional: true, + parseLevel: 'compile', }, }); @@ -74,11 +89,46 @@ const ComputedOnlyPointBuySchema = createPropertySchema({ type: 'computedOnlyField', optional: true, }, - total: { + cost: { + type: 'computedOnlyField', + optional: true, + parseLevel: 'compile', + }, + 'values': { + type: Array, + defaultValue: [], + maxCount: STORAGE_LIMITS.pointBuyRowsCount, + }, + 'values.$': { + type: Object, + }, + 'values.$.min': { type: 'computedOnlyField', optional: true, }, - cost: { + 'values.$.max': { + type: 'computedOnlyField', + optional: true, + }, + 'values.$.cost': { + type: 'computedOnlyField', + optional: true, + parseLevel: 'compile', + }, + 'values.$.spent': { + type: Number, + optional: true, + removeBeforeCompute: true, + }, + 'values.$.errors': { + type: Array, + optional: true, + removeBeforeCompute: true, + }, + 'values.$.errors.$': { + type: ErrorSchema, + }, + total: { type: 'computedOnlyField', optional: true, }, @@ -87,6 +137,19 @@ const ComputedOnlyPointBuySchema = createPropertySchema({ optional: true, removeBeforeCompute: true, }, + pointsLeft: { + type: Number, + optional: true, + removeBeforeCompute: true, + }, + errors: { + type: Array, + optional: true, + removeBeforeCompute: true, + }, + 'errors.$': { + type: ErrorSchema, + }, }); const ComputedPointBuySchema = new SimpleSchema() diff --git a/app/imports/api/properties/Proficiencies.js b/app/imports/api/properties/Proficiencies.js index 8e8246ac..e79276ff 100644 --- a/app/imports/api/properties/Proficiencies.js +++ b/app/imports/api/properties/Proficiencies.js @@ -2,28 +2,28 @@ import SimpleSchema from 'simpl-schema'; import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js'; let ProficiencySchema = new SimpleSchema({ - name: { - type: String, - optional: true, + name: { + type: String, + optional: true, max: STORAGE_LIMITS.name, - }, - // The variableNames of the skills, tags, or attributes to apply proficiency to - stats: { - type: Array, - defaultValue: [], + }, + // The variableNames of the skills, tags, or attributes to apply proficiency to + stats: { + type: Array, + defaultValue: [], maxCount: STORAGE_LIMITS.statsToTarget, - }, - 'stats.$': { - type: String, + }, + 'stats.$': { + type: String, max: STORAGE_LIMITS.variableName, - }, - // A number representing how proficient the character is + }, + // A number representing how proficient the character is // where 0.49 is half rounded down and 0.5 is half rounded up - value: { - type: Number, - allowedValues: [0.49, 0.5, 1, 2], - defaultValue: 1, - }, + value: { + type: Number, + allowedValues: [0.49, 0.5, 1, 2], + defaultValue: 1, + }, }); const ComputedOnlyProficiencySchema = new SimpleSchema({}); diff --git a/app/imports/api/properties/Rolls.js b/app/imports/api/properties/Rolls.js index 03e819a4..7a2c5eeb 100644 --- a/app/imports/api/properties/Rolls.js +++ b/app/imports/api/properties/Rolls.js @@ -23,14 +23,14 @@ import createPropertySchema from '/imports/api/properties/subSchemas/createPrope */ let RollSchema = createPropertySchema({ name: { - type: String, + type: String, defaultValue: 'New Roll', max: STORAGE_LIMITS.name, - }, + }, // The technical, lowercase, single-word name used in formulae variableName: { type: String, - regEx: VARIABLE_NAME_REGEX, + regEx: VARIABLE_NAME_REGEX, min: 2, defaultValue: 'newRoll', max: STORAGE_LIMITS.variableName, diff --git a/app/imports/api/properties/SavingThrows.js b/app/imports/api/properties/SavingThrows.js index f5cfbf70..d0045187 100644 --- a/app/imports/api/properties/SavingThrows.js +++ b/app/imports/api/properties/SavingThrows.js @@ -16,20 +16,25 @@ let SavingThrowSchema = createPropertySchema({ optional: true, }, // Who this saving throw applies to - target: { - type: String, + target: { + type: String, defaultValue: 'target', - allowedValues: [ + allowedValues: [ 'self', 'target', ], - }, + }, // The variable name of save to roll stat: { type: String, optional: true, max: STORAGE_LIMITS.variableName, }, + // Prevent the property from showing up in the log + silent: { + type: Boolean, + optional: true, + }, }); const ComputedOnlySavingThrowSchema = createPropertySchema({ diff --git a/app/imports/api/properties/Skills.js b/app/imports/api/properties/Skills.js index 47ba2a76..a2083cdf 100644 --- a/app/imports/api/properties/Skills.js +++ b/app/imports/api/properties/Skills.js @@ -9,10 +9,10 @@ import createPropertySchema from '/imports/api/properties/subSchemas/createPrope */ let SkillSchema = createPropertySchema({ name: { - type: String, - optional: true, + type: String, + optional: true, max: STORAGE_LIMITS.name, - }, + }, // The technical, lowercase, single-word name used in formulae // Ignored for skilltype = save variableName: { @@ -22,33 +22,33 @@ let SkillSchema = createPropertySchema({ max: STORAGE_LIMITS.variableName, optional: true, }, - // The variable name of the ability this skill relies on + // The variable name of the ability this skill relies on ability: { type: String, optional: true, max: STORAGE_LIMITS.variableName, }, - // What type of skill is this + // What type of skill is this skillType: { type: String, allowedValues: [ 'skill', 'save', - 'check', + 'check', 'tool', 'weapon', 'armor', 'language', - 'utility', //not displayed anywhere + 'utility', //not displayed anywhere ], defaultValue: 'skill', }, - // The base proficiency of this skill - baseProficiency: { - type: Number, - optional: true, + // The base proficiency of this skill + baseProficiency: { + type: Number, + optional: true, allowedValues: [0.49, 0.5, 1, 2], - }, + }, // The starting value, before effects baseValue: { type: 'fieldToCompute', @@ -56,16 +56,16 @@ let SkillSchema = createPropertySchema({ }, // Description of what the skill is used for description: { - type: 'inlineCalculationFieldToCompute', - optional: true, - }, + type: 'inlineCalculationFieldToCompute', + optional: true, + }, }); let ComputedOnlySkillSchema = createPropertySchema({ - // Computed value of skill to be added to skill rolls + // Computed value of skill to be added to skill rolls value: { type: Number, - defaultValue: 0, + defaultValue: 0, optional: true, removeBeforeCompute: true, }, @@ -75,33 +75,33 @@ let ComputedOnlySkillSchema = createPropertySchema({ optional: true, }, description: { - type: 'computedOnlyInlineCalculationField', - optional: true, - }, - // Computed value added by the ability - abilityMod: { - type: SimpleSchema.Integer, - optional: true, + type: 'computedOnlyInlineCalculationField', + optional: true, + }, + // Computed value added by the ability + abilityMod: { + type: SimpleSchema.Integer, + optional: true, removeBeforeCompute: true, - }, - // Computed advantage/disadvantage + }, + // Computed advantage/disadvantage advantage: { type: SimpleSchema.Integer, optional: true, allowedValues: [-1, 0, 1], removeBeforeCompute: true, }, - // Computed bonus to passive checks + // Computed bonus to passive checks passiveBonus: { type: Number, optional: true, removeBeforeCompute: true, }, - // Computed proficiency multiplier + // Computed proficiency multiplier proficiency: { type: Number, allowedValues: [0, 0.49, 0.5, 1, 2], - defaultValue: 0, + defaultValue: 0, removeBeforeCompute: true, }, // Compiled text of all conditional benefits @@ -113,7 +113,7 @@ let ComputedOnlySkillSchema = createPropertySchema({ 'conditionalBenefits.$': { type: String, }, - // Computed number of things forcing this skill to fail + // Computed number of things forcing this skill to fail fail: { type: SimpleSchema.Integer, optional: true, @@ -135,6 +135,7 @@ let ComputedOnlySkillSchema = createPropertySchema({ effects: { type: Array, optional: true, + removeBeforeCompute: true, }, 'effects.$': { type: Object, diff --git a/app/imports/api/properties/SpellLists.js b/app/imports/api/properties/SpellLists.js index c4911cf0..01434ea2 100644 --- a/app/imports/api/properties/SpellLists.js +++ b/app/imports/api/properties/SpellLists.js @@ -3,17 +3,17 @@ import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js'; import createPropertySchema from '/imports/api/properties/subSchemas/createPropertySchema.js'; let SpellListSchema = createPropertySchema({ - name: { - type: String, - optional: true, + name: { + type: String, + optional: true, max: STORAGE_LIMITS.name, - }, + }, description: { - type: 'inlineCalculationFieldToCompute', - optional: true, - }, - // Calculation of how many spells in this list can be prepared - maxPrepared: { + type: 'inlineCalculationFieldToCompute', + optional: true, + }, + // Calculation of how many spells in this list can be prepared + maxPrepared: { type: 'fieldToCompute', optional: true, }, diff --git a/app/imports/api/properties/Spells.js b/app/imports/api/properties/Spells.js index 304e16a3..575c9b5e 100644 --- a/app/imports/api/properties/Spells.js +++ b/app/imports/api/properties/Spells.js @@ -3,93 +3,93 @@ import SimpleSchema from 'simpl-schema'; import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js'; const magicSchools = [ - 'abjuration', - 'conjuration', - 'divination', - 'enchantment', - 'evocation', - 'illusion', - 'necromancy', - 'transmutation', + 'abjuration', + 'conjuration', + 'divination', + 'enchantment', + 'evocation', + 'illusion', + 'necromancy', + 'transmutation', ]; let SpellSchema = new SimpleSchema({}) -.extend(ActionSchema) -.extend({ - name: { - type: String, - optional: true, - max: STORAGE_LIMITS.name, - }, - // If it's always prepared, it doesn't count against the number of spells - // prepared in a spell list, and enabled should be true - alwaysPrepared: { - type: Boolean, - optional: true, - }, - prepared: { - type: Boolean, - optional: true, - }, - // This spell ignores spell slot rules - castWithoutSpellSlots: { - type: Boolean, - optional: true, - }, - hasAttackRoll: { - type: Boolean, - optional: true, - }, - castingTime: { - type: String, - optional: true, - defaultValue: 'action', - max: STORAGE_LIMITS.spellDetail, - }, - range: { - type: String, - optional: true, - max: STORAGE_LIMITS.spellDetail, - }, - duration: { - type: String, - optional: true, - defaultValue: 'Instantaneous', - max: STORAGE_LIMITS.spellDetail, - }, - verbal: { - type: Boolean, - optional: true, - }, - somatic: { - type: Boolean, - optional: true, - }, - concentration: { - type: Boolean, - optional: true, - }, - material: { - type: String, - optional: true, - max: STORAGE_LIMITS.spellDetail, - }, - ritual: { - type: Boolean, - optional: true, - }, - level: { - type: SimpleSchema.Integer, - defaultValue: 1, - max: 9, - min: 0, - }, - school: { - type: String, - defaultValue: 'abjuration', - allowedValues: magicSchools, - }, -}); + .extend(ActionSchema) + .extend({ + name: { + type: String, + optional: true, + max: STORAGE_LIMITS.name, + }, + // If it's always prepared, it doesn't count against the number of spells + // prepared in a spell list, and enabled should be true + alwaysPrepared: { + type: Boolean, + optional: true, + }, + prepared: { + type: Boolean, + optional: true, + }, + // This spell ignores spell slot rules + castWithoutSpellSlots: { + type: Boolean, + optional: true, + }, + hasAttackRoll: { + type: Boolean, + optional: true, + }, + castingTime: { + type: String, + optional: true, + defaultValue: 'action', + max: STORAGE_LIMITS.spellDetail, + }, + range: { + type: String, + optional: true, + max: STORAGE_LIMITS.spellDetail, + }, + duration: { + type: String, + optional: true, + defaultValue: 'Instantaneous', + max: STORAGE_LIMITS.spellDetail, + }, + verbal: { + type: Boolean, + optional: true, + }, + somatic: { + type: Boolean, + optional: true, + }, + concentration: { + type: Boolean, + optional: true, + }, + material: { + type: String, + optional: true, + max: STORAGE_LIMITS.spellDetail, + }, + ritual: { + type: Boolean, + optional: true, + }, + level: { + type: SimpleSchema.Integer, + defaultValue: 1, + max: 9, + min: 0, + }, + school: { + type: String, + defaultValue: 'abjuration', + allowedValues: magicSchools, + }, + }); const ComputedOnlySpellSchema = new SimpleSchema() .extend(ComputedOnlyActionSchema); diff --git a/app/imports/api/properties/Toggles.js b/app/imports/api/properties/Toggles.js index 7a76d061..755ed89b 100644 --- a/app/imports/api/properties/Toggles.js +++ b/app/imports/api/properties/Toggles.js @@ -41,7 +41,7 @@ const ComputedOnlyToggleSchema = createPropertySchema({ }); const ComputedToggleSchema = new SimpleSchema() - .extend(ComputedOnlyToggleSchema) - .extend(ToggleSchema); + .extend(ComputedOnlyToggleSchema) + .extend(ToggleSchema); export { ToggleSchema, ComputedOnlyToggleSchema, ComputedToggleSchema }; diff --git a/app/imports/api/properties/Triggers.js b/app/imports/api/properties/Triggers.js index 4b66e422..0bfd7d9d 100644 --- a/app/imports/api/properties/Triggers.js +++ b/app/imports/api/properties/Triggers.js @@ -109,6 +109,11 @@ let TriggerSchema = createPropertySchema({ type: String, max: STORAGE_LIMITS.tagLength, }, + // Prevent the property from showing up in the log + silent: { + type: Boolean, + optional: true, + }, }); const ComputedOnlyTriggerSchema = createPropertySchema({ diff --git a/app/imports/api/properties/computedOnlyPropertySchemasIndex.js b/app/imports/api/properties/computedOnlyPropertySchemasIndex.js index c81f6876..93f3793a 100644 --- a/app/imports/api/properties/computedOnlyPropertySchemasIndex.js +++ b/app/imports/api/properties/computedOnlyPropertySchemasIndex.js @@ -16,6 +16,7 @@ import { ComputedOnlyFeatureSchema } from '/imports/api/properties/Features.js'; import { ComputedOnlyFolderSchema } from '/imports/api/properties/Folders.js'; import { ComputedOnlyItemSchema } from '/imports/api/properties/Items.js'; import { ComputedOnlyNoteSchema } from '/imports/api/properties/Notes.js'; +import { ComputedOnlyPointBuySchema } from '/imports/api/properties/PointBuys.js'; import { ComputedOnlyProficiencySchema } from '/imports/api/properties/Proficiencies.js'; import { ComputedOnlyReferenceSchema } from '/imports/api/properties/References.js'; import { ComputedOnlyRollSchema } from '/imports/api/properties/Rolls.js'; @@ -46,6 +47,7 @@ const propertySchemasIndex = { folder: ComputedOnlyFolderSchema, item: ComputedOnlyItemSchema, note: ComputedOnlyNoteSchema, + pointBuy: ComputedOnlyPointBuySchema, proficiency: ComputedOnlyProficiencySchema, propertySlot: ComputedOnlySlotSchema, reference: ComputedOnlyReferenceSchema, diff --git a/app/imports/api/properties/computedPropertySchemasIndex.js b/app/imports/api/properties/computedPropertySchemasIndex.js index 25b480b0..7bdfb302 100644 --- a/app/imports/api/properties/computedPropertySchemasIndex.js +++ b/app/imports/api/properties/computedPropertySchemasIndex.js @@ -16,6 +16,7 @@ import { ComputedFeatureSchema } from '/imports/api/properties/Features.js'; import { FolderSchema } from '/imports/api/properties/Folders.js'; import { ComputedItemSchema } from '/imports/api/properties/Items.js'; import { ComputedNoteSchema } from '/imports/api/properties/Notes.js'; +import { ComputedPointBuySchema } from '/imports/api/properties/PointBuys.js'; import { ProficiencySchema } from '/imports/api/properties/Proficiencies.js'; import { ReferenceSchema } from '/imports/api/properties/References.js'; import { ComputedRollSchema } from '/imports/api/properties/Rolls.js'; @@ -44,6 +45,7 @@ const propertySchemasIndex = { feature: ComputedFeatureSchema, folder: FolderSchema, note: ComputedNoteSchema, + pointBuy: ComputedPointBuySchema, proficiency: ProficiencySchema, propertySlot: ComputedSlotSchema, reference: ReferenceSchema, diff --git a/app/imports/api/properties/propertySchemasIndex.js b/app/imports/api/properties/propertySchemasIndex.js index 23fa4bf4..fdccedc9 100644 --- a/app/imports/api/properties/propertySchemasIndex.js +++ b/app/imports/api/properties/propertySchemasIndex.js @@ -14,6 +14,7 @@ import { EffectSchema } from '/imports/api/properties/Effects.js'; import { FeatureSchema } from '/imports/api/properties/Features.js'; import { FolderSchema } from '/imports/api/properties/Folders.js'; import { NoteSchema } from '/imports/api/properties/Notes.js'; +import { PointBuySchema } from '/imports/api/properties/PointBuys.js'; import { ProficiencySchema } from '/imports/api/properties/Proficiencies.js'; import { ReferenceSchema } from '/imports/api/properties/References.js'; import { RollSchema } from '/imports/api/properties/Rolls.js'; @@ -44,6 +45,7 @@ const propertySchemasIndex = { feature: FeatureSchema, folder: FolderSchema, note: NoteSchema, + pointBuy: PointBuySchema, proficiency: ProficiencySchema, propertySlot: SlotSchema, reference: ReferenceSchema, diff --git a/app/imports/api/properties/subSchemas/AdjustmentSchema.js b/app/imports/api/properties/subSchemas/AdjustmentSchema.js index 04031e2a..5ca96137 100644 --- a/app/imports/api/properties/subSchemas/AdjustmentSchema.js +++ b/app/imports/api/properties/subSchemas/AdjustmentSchema.js @@ -5,31 +5,31 @@ const AdjustmentSchema = new SimpleSchema({ _id: { type: String, regEx: SimpleSchema.RegEx.Id, - autoValue(){ + autoValue() { if (!this.isSet) return Random.id(); } }, - // The roll that determines how much to change the attribute + // The roll that determines how much to change the attribute adjustment: { type: String, optional: true, defaultValue: '1', }, - // Who this adjustment applies to - target: { - type: String, + // Who this adjustment applies to + target: { + type: String, defaultValue: 'every', - allowedValues: [ + allowedValues: [ 'self', // the character who took the action 'each', // rolled once for `each` target 'every', // rolled once and applied to `every` target ], - }, - // The stat this rolls applies to, if damage type is set, this is ignored - stat: { - type: String, + }, + // The stat this rolls applies to, if damage type is set, this is ignored + stat: { + type: String, optional: true, - }, + }, }); export default AdjustmentSchema; diff --git a/app/imports/api/properties/subSchemas/ColorSchema.js b/app/imports/api/properties/subSchemas/ColorSchema.js index f258c269..0597b336 100644 --- a/app/imports/api/properties/subSchemas/ColorSchema.js +++ b/app/imports/api/properties/subSchemas/ColorSchema.js @@ -1,12 +1,12 @@ import SimpleSchema from 'simpl-schema'; const ColorSchema = new SimpleSchema({ - color: { - type: String, - // match hex colors of the form #A23 or #A23f56 - regEx: /^#([a-f0-9]{3}){1,2}\b$/i, - optional: true, - }, + color: { + type: String, + // match hex colors of the form #A23 or #A23f56 + regEx: /^#([a-f0-9]{3}){1,2}\b$/i, + optional: true, + }, }); export default ColorSchema; diff --git a/app/imports/api/properties/subSchemas/DeathSavesSchema.js b/app/imports/api/properties/subSchemas/DeathSavesSchema.js index ea7f2933..b6238544 100644 --- a/app/imports/api/properties/subSchemas/DeathSavesSchema.js +++ b/app/imports/api/properties/subSchemas/DeathSavesSchema.js @@ -1,26 +1,26 @@ import SimpleSchema from 'simpl-schema'; const DeathSavesSchema = new SimpleSchema({ - pass: { - type: SimpleSchema.Integer, - min: 0, - max: 3, - defaultValue: 0, - }, - fail: { - type: SimpleSchema.Integer, - min: 0, - max: 3, - defaultValue: 0, - }, - canDeathSave: { - type: Boolean, - defaultValue: true, - }, - stable: { - type: Boolean, - defaultValue: false, - }, + pass: { + type: SimpleSchema.Integer, + min: 0, + max: 3, + defaultValue: 0, + }, + fail: { + type: SimpleSchema.Integer, + min: 0, + max: 3, + defaultValue: 0, + }, + canDeathSave: { + type: Boolean, + defaultValue: true, + }, + stable: { + type: Boolean, + defaultValue: false, + }, }); export default DeathSavesSchema; diff --git a/app/imports/api/properties/subSchemas/ErrorSchema.js b/app/imports/api/properties/subSchemas/ErrorSchema.js index 87835150..41635874 100644 --- a/app/imports/api/properties/subSchemas/ErrorSchema.js +++ b/app/imports/api/properties/subSchemas/ErrorSchema.js @@ -6,10 +6,10 @@ const ErrorSchema = new SimpleSchema({ type: String, max: STORAGE_LIMITS.errorMessage, }, - type: { + type: { type: String, max: STORAGE_LIMITS.name, - }, + }, }); export default ErrorSchema; diff --git a/app/imports/api/properties/subSchemas/InlineComputationSchema.js b/app/imports/api/properties/subSchemas/InlineComputationSchema.js index e220a3aa..14a33e75 100644 --- a/app/imports/api/properties/subSchemas/InlineComputationSchema.js +++ b/app/imports/api/properties/subSchemas/InlineComputationSchema.js @@ -3,7 +3,7 @@ import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js'; import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js'; const InlineComputationSchema = new SimpleSchema({ - // The part between bracers {} + // The part between bracers {} calculation: { type: String, max: STORAGE_LIMITS.calculation, diff --git a/app/imports/api/properties/subSchemas/RollResultsSchema.js b/app/imports/api/properties/subSchemas/RollResultsSchema.js index 1d555ddc..8aea32e9 100644 --- a/app/imports/api/properties/subSchemas/RollResultsSchema.js +++ b/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(); } }, @@ -17,9 +17,9 @@ let RollResultsSchema = new SimpleSchema ({ optional: true, }, results: { - type: ResultsSchema, - defaultValue: {}, - }, + type: ResultsSchema, + defaultValue: {}, + }, }); -export default RollResultsSchema ; +export default RollResultsSchema; diff --git a/app/imports/api/sharing/SharingSchema.js b/app/imports/api/sharing/SharingSchema.js index 77e5f939..2a4f87c3 100644 --- a/app/imports/api/sharing/SharingSchema.js +++ b/app/imports/api/sharing/SharingSchema.js @@ -4,35 +4,35 @@ import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js'; let SharingSchema = new SimpleSchema({ owner: { - type: String, - regEx: SimpleSchema.RegEx.Id, - index: 1 - }, - readers: { - type: Array, - defaultValue: [], - index: 1, + type: String, + regEx: SimpleSchema.RegEx.Id, + index: 1 + }, + readers: { + type: Array, + defaultValue: [], + index: 1, maxCount: STORAGE_LIMITS.readersCount, - }, - 'readers.$': { - type: String, - regEx: SimpleSchema.RegEx.Id - }, - writers: { - type: Array, - defaultValue: [], - index: 1, + }, + 'readers.$': { + type: String, + regEx: SimpleSchema.RegEx.Id + }, + writers: { + type: Array, + defaultValue: [], + index: 1, maxCount: STORAGE_LIMITS.writersCount, - }, - 'writers.$': { - type: String, - regEx: SimpleSchema.RegEx.Id - }, - public: { - type: Boolean, - defaultValue: false, - index: 1, - }, + }, + 'writers.$': { + type: String, + regEx: SimpleSchema.RegEx.Id + }, + public: { + type: Boolean, + defaultValue: false, + index: 1, + }, }); export default SharingSchema; diff --git a/app/imports/api/sharing/sharing.js b/app/imports/api/sharing/sharing.js index d026d879..f6c8d8b7 100644 --- a/app/imports/api/sharing/sharing.js +++ b/app/imports/api/sharing/sharing.js @@ -9,8 +9,8 @@ import { getUserTier } from '/imports/api/users/patreon/tiers.js'; const setPublic = new ValidatedMethod({ name: 'sharing.setPublic', - validate: new SimpleSchema({ - docRef: RefSchema, + validate: new SimpleSchema({ + docRef: RefSchema, isPublic: { type: Boolean }, }).validator(), mixins: [RateLimiterMixin], @@ -18,19 +18,19 @@ const setPublic = new ValidatedMethod({ numRequests: 5, timeInterval: 5000, }, - run({docRef, isPublic}){ - let doc = fetchDocByRef(docRef); - assertOwnership(doc, this.userId); - return getCollectionByName(docRef.collection).update(docRef.id, { - $set: {public: isPublic}, + run({ docRef, isPublic }) { + let doc = fetchDocByRef(docRef); + assertOwnership(doc, this.userId); + return getCollectionByName(docRef.collection).update(docRef.id, { + $set: { public: isPublic }, }); - }, + }, }); const updateUserSharePermissions = new ValidatedMethod({ name: 'sharing.updateUserSharePermissions', - validate: new SimpleSchema({ - docRef: RefSchema, + validate: new SimpleSchema({ + docRef: RefSchema, userId: { type: String, regEx: SimpleSchema.RegEx.Id, @@ -45,40 +45,40 @@ const updateUserSharePermissions = new ValidatedMethod({ numRequests: 5, timeInterval: 5000, }, - run({docRef, userId, role}){ - let doc = fetchDocByRef(docRef); - if (role === 'none'){ + run({ docRef, userId, role }) { + let doc = fetchDocByRef(docRef); + 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'); + '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 }, }); } - }, + }, }); const transferOwnership = new ValidatedMethod({ name: 'sharing.transferOwnership', - validate: new SimpleSchema({ - docRef: RefSchema, + validate: new SimpleSchema({ + docRef: RefSchema, userId: { type: String, regEx: SimpleSchema.RegEx.Id, @@ -89,31 +89,31 @@ 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') + 'The new owner is already at their character limit') } - } else if (docRef.collection === 'libraries'){ - if (!tier.paidBenefits){ + } else if (docRef.collection === 'libraries') { + if (!tier.paidBenefits) { throw new Meteor.Error('Sharing.methods.transferOwnership.denied', - 'The new owner\'s Patreon tier does not have access to library ownership'); + 'The new owner\'s Patreon tier does not have access to library ownership'); } } @@ -123,10 +123,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 }; diff --git a/app/imports/api/tabletop/Messages.js b/app/imports/api/tabletop/Messages.js index b2dc0280..634f32d9 100644 --- a/app/imports/api/tabletop/Messages.js +++ b/app/imports/api/tabletop/Messages.js @@ -51,21 +51,21 @@ 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', - 'You need to be logged in to send a message'); + 'You need to be logged in to send a message'); } assertUserInTabletop(tabletopId, this.userId); return Messages.insert({ - content, + content, tabletopId, timestamp: new Date(), userId: user._id, username: user.username, - }); + }); }, }); @@ -87,24 +87,24 @@ 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'); + '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'); + 'You don\'t have permission to remove this message'); } let removed = Messages.remove({ - _id: messageId, - }); + _id: messageId, + }); Creatures.update({ tabletop: tabletopId, }, { - $unset: {tabletop: 1}, + $unset: { tabletop: 1 }, }); return removed; }, diff --git a/app/imports/api/tabletop/methods/insertTabletop.js b/app/imports/api/tabletop/methods/insertTabletop.js index 0857031a..62ad2156 100644 --- a/app/imports/api/tabletop/methods/insertTabletop.js +++ b/app/imports/api/tabletop/methods/insertTabletop.js @@ -19,14 +19,14 @@ const insertTabletop = new ValidatedMethod({ run() { if (!this.userId) { throw new Meteor.Error('tabletops.insert.denied', - 'You need to be logged in to insert a tabletop'); + 'You need to be logged in to insert a tabletop'); } assertUserHasPaidBenefits(this.userId); assertAdmin(this.userId); return Tabletops.insert({ - gameMaster: this.userId, - }); + gameMaster: this.userId, + }); }, }); diff --git a/app/imports/api/tabletop/methods/removeTabletop.js b/app/imports/api/tabletop/methods/removeTabletop.js index 633cc6d0..4636eb4b 100644 --- a/app/imports/api/tabletop/methods/removeTabletop.js +++ b/app/imports/api/tabletop/methods/removeTabletop.js @@ -24,22 +24,22 @@ 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'); + 'You need to be logged in to remove a tabletop'); } assertUserHasPaidBenefits(this.userId); assertUserIsTabletopOwner(tabletopId, this.userId); assertAdmin(this.userId); let removed = Tabletops.remove({ - _id: tabletopId, - }); + _id: tabletopId, + }); Creatures.update({ tabletop: tabletopId, }, { - $unset: {tabletop: 1}, + $unset: { tabletop: 1 }, }); return removed; }, diff --git a/app/imports/api/users/Users.js b/app/imports/api/users/Users.js index b3152af8..54328914 100644 --- a/app/imports/api/users/Users.js +++ b/app/imports/api/users/Users.js @@ -11,94 +11,94 @@ const defaultLibraries = process.env.DEFAULT_LIBRARIES && process.env.DEFAULT_LI const defaultLibraryCollections = process.env.DEFAULT_LIBRARY_COLLECTIONS && process.env.DEFAULT_LIBRARY_COLLECTIONS.split(',') || []; const userSchema = new SimpleSchema({ - username: { - type: String, - optional: true, - max: 30, - min: 4, - }, - emails: { - type: Array, - optional: true, - }, - 'emails.$': { - type: Object, - }, - 'emails.$.address': { - type: String, - regEx: SimpleSchema.RegEx.Email, - }, - 'emails.$.verified': { - type: Boolean, - }, - registered_emails: { - type: Array, - optional: true, - }, - 'registered_emails.$': { - type: Object, - blackbox: true, - }, - createdAt: { - type: Date - }, - services: { - type: Object, - optional: true, - blackbox: true, - }, - roles: { - type: Array, - optional: true, - }, - 'roles.$': { - type: String - }, - // In order to avoid an 'Exception in setInterval callback' from Meteor - heartbeat: { - type: Date, - optional: true, - }, - apiKey: { - type: String, - index: 1, - optional: true, - }, - darkMode: { - type: Boolean, - optional: true, - }, - subscribedLibraries: { - type: Array, - defaultValue: defaultLibraries, - maxCount: 100, - }, - 'subscribedLibraries.$': { - type: String, + username: { + type: String, + optional: true, + max: 30, + min: 4, + }, + emails: { + type: Array, + optional: true, + }, + 'emails.$': { + type: Object, + }, + 'emails.$.address': { + type: String, + regEx: SimpleSchema.RegEx.Email, + }, + 'emails.$.verified': { + type: Boolean, + }, + registered_emails: { + type: Array, + optional: true, + }, + 'registered_emails.$': { + type: Object, + blackbox: true, + }, + createdAt: { + type: Date + }, + services: { + type: Object, + optional: true, + blackbox: true, + }, + roles: { + type: Array, + optional: true, + }, + 'roles.$': { + type: String + }, + // In order to avoid an 'Exception in setInterval callback' from Meteor + heartbeat: { + type: Date, + optional: true, + }, + apiKey: { + type: String, + index: 1, + optional: true, + }, + darkMode: { + type: Boolean, + optional: true, + }, + subscribedLibraries: { + type: Array, + defaultValue: defaultLibraries, + maxCount: 100, + }, + 'subscribedLibraries.$': { + type: String, regEx: SimpleSchema.RegEx.Id, - }, - subscribedLibraryCollections: { - type: Array, - defaultValue: defaultLibraryCollections, - maxCount: 100, - }, - 'subscribedLibraryCollections.$': { - type: String, + }, + subscribedLibraryCollections: { + type: Array, + defaultValue: defaultLibraryCollections, + maxCount: 100, + }, + 'subscribedLibraryCollections.$': { + type: String, regEx: SimpleSchema.RegEx.Id, - }, + }, subscribedCharacters: { - type: Array, - defaultValue: [], - max: 100, - }, - 'subscribedCharacters.$': { - type: String, + type: Array, + defaultValue: [], + max: 100, + }, + 'subscribedCharacters.$': { + type: String, regEx: SimpleSchema.RegEx.Id, - }, - fileStorageUsed: { - type: Number, - optional: true, - }, + }, + fileStorageUsed: { + type: Number, + optional: true, + }, profile: { type: Object, blackbox: true, @@ -123,25 +123,25 @@ Meteor.users.attachSchema(userSchema); Meteor.users.generateApiKey = new ValidatedMethod({ name: 'users.generateApiKey', - validate: null, + validate: null, mixins: [RateLimiterMixin], rateLimit: { numRequests: 5, timeInterval: 5000, }, - run(){ - 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}}); - }, + run() { + 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.setDarkMode = new ValidatedMethod({ name: 'users.setDarkMode', - validate: new SimpleSchema({ + validate: new SimpleSchema({ darkMode: { type: Boolean }, }).validator(), mixins: [RateLimiterMixin], @@ -149,81 +149,81 @@ Meteor.users.setDarkMode = new ValidatedMethod({ numRequests: 5, timeInterval: 5000, }, - run({darkMode}){ - if (!this.userId) return; - Meteor.users.update(this.userId, {$set: {darkMode}}); - }, + run({ darkMode }) { + if (!this.userId) return; + Meteor.users.update(this.userId, { $set: { darkMode } }); + }, }); Meteor.users.sendVerificationEmail = new ValidatedMethod({ - name: 'users.sendVerificationEmail', - validate: new SimpleSchema({ - userId:{ - type: String, - optional: true, - }, - address: { - type: String, - }, - }).validator(), + name: 'users.sendVerificationEmail', + validate: new SimpleSchema({ + userId: { + type: String, + optional: true, + }, + address: { + type: String, + }, + }).validator(), mixins: [RateLimiterMixin], rateLimit: { numRequests: 5, timeInterval: 5000, }, - run({userId, address}){ - userId = this.userId || userId; - let user = Meteor.users.findOne(userId); - if (!user) { - throw new Meteor.Error('User not found', - 'Can\'t send a validation email to a user that does not exist'); - } - if (!some(user.emails, email => email.address === address)) { - throw new Meteor.Error('Email address not found', - 'The specified email address wasn\'t found on this user account'); - } - Accounts.sendVerificationEmail(userId, address); - } + run({ userId, address }) { + userId = this.userId || userId; + let user = Meteor.users.findOne(userId); + if (!user) { + throw new Meteor.Error('User not found', + 'Can\'t send a validation email to a user that does not exist'); + } + if (!some(user.emails, email => email.address === address)) { + throw new Meteor.Error('Email address not found', + 'The specified email address wasn\'t found on this user account'); + } + Accounts.sendVerificationEmail(userId, address); + } }); Meteor.users.canPickUsername = new ValidatedMethod({ - name: 'users.canPickUsername', - validate: userSchema.pick('username').validator(), + name: 'users.canPickUsername', + validate: userSchema.pick('username').validator(), mixins: [RateLimiterMixin], rateLimit: { numRequests: 5, timeInterval: 5000, }, - run({username}){ - if (Meteor.isClient) return; - let user = Accounts.findUserByUsername(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; - } + return !!user; + } }); Meteor.users.setUsername = new ValidatedMethod({ name: 'users.setUsername', - validate: userSchema.pick('username').validator(), + validate: userSchema.pick('username').validator(), mixins: [RateLimiterMixin], rateLimit: { numRequests: 5, timeInterval: 5000, }, - run({username}){ - if (!this.userId) throw 'Can only set your username if logged in'; + run({ username }) { + if (!this.userId) throw 'Can only set your username if logged in'; if (Meteor.isClient) return; return Accounts.setUsername(this.userId, username) - } + } }); Meteor.users.setPreference = new ValidatedMethod({ name: 'users.setPreference', - validate: new SimpleSchema({ - preference:{ + validate: new SimpleSchema({ + preference: { type: String, }, value: { @@ -235,97 +235,97 @@ Meteor.users.setPreference = new ValidatedMethod({ numRequests: 5, timeInterval: 5000, }, - run({preference, value}){ - if (!this.userId) throw 'You can only set preferences once logged in'; + 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 }, }); } - }, + }, }); Meteor.users.subscribeToLibrary = new ValidatedMethod({ name: 'users.subscribeToLibrary', - validate: new SimpleSchema({ - libraryId:{ - type: String, + validate: new SimpleSchema({ + libraryId: { + type: String, regEx: SimpleSchema.RegEx.Id, - }, + }, subscribe: { type: Boolean, }, - }).validator(), + }).validator(), mixins: [RateLimiterMixin], rateLimit: { numRequests: 5, timeInterval: 5000, }, - run({libraryId, subscribe}){ - if (!this.userId) throw 'Can only subscribe if logged in'; - if (subscribe){ + run({ libraryId, subscribe }) { + if (!this.userId) throw 'Can only subscribe if logged in'; + 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 }, }); } - } + } }); Meteor.users.subscribeToLibraryCollection = new ValidatedMethod({ name: 'users.subscribeToLibraryCollection', - validate: new SimpleSchema({ - libraryCollectionId:{ - type: String, + validate: new SimpleSchema({ + libraryCollectionId: { + type: String, regEx: SimpleSchema.RegEx.Id, - }, + }, subscribe: { type: Boolean, }, - }).validator(), + }).validator(), mixins: [RateLimiterMixin], rateLimit: { numRequests: 5, timeInterval: 5000, }, - run({libraryCollectionId, subscribe}){ - if (!this.userId) throw 'Can only subscribe if logged in'; - if (subscribe){ + run({ libraryCollectionId, subscribe }) { + if (!this.userId) throw 'Can only subscribe if logged in'; + 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 }, }); } - } + } }); Meteor.users.findUserByUsernameOrEmail = new ValidatedMethod({ - name: 'users.findUserByUsernameOrEmail', - validate: new SimpleSchema({ - usernameOrEmail:{ - type: String, - }, - }).validator(), + name: 'users.findUserByUsernameOrEmail', + validate: new SimpleSchema({ + usernameOrEmail: { + type: String, + }, + }).validator(), mixins: [RateLimiterMixin], rateLimit: { numRequests: 5, timeInterval: 5000, }, - run({usernameOrEmail}){ - if (Meteor.isClient) return; - let user = Accounts.findUserByUsername(usernameOrEmail) || - Accounts.findUserByEmail(usernameOrEmail); - return user && user._id; - } + run({ usernameOrEmail }) { + if (Meteor.isClient) return; + let user = Accounts.findUserByUsername(usernameOrEmail) || + Accounts.findUserByEmail(usernameOrEmail); + return user && user._id; + } }); diff --git a/app/imports/api/users/methods/addEmail.js b/app/imports/api/users/methods/addEmail.js index af8e81f6..6abb2435 100644 --- a/app/imports/api/users/methods/addEmail.js +++ b/app/imports/api/users/methods/addEmail.js @@ -3,8 +3,8 @@ import { ValidatedMethod } from 'meteor/mdg:validated-method'; import { RateLimiterMixin } from 'ddp-rate-limiter-mixin'; const addEmail = new ValidatedMethod({ - name: 'users.addEmail', - validate: new SimpleSchema({ + name: 'users.addEmail', + validate: new SimpleSchema({ email: { type: String, regEx: SimpleSchema.RegEx.Email, @@ -15,20 +15,20 @@ 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){ + 'You must be logged in to add an email address'); + if (user.emails && user.emails.length >= 2) { throw new Meteor.Error('Emails full', - 'You may only have up to 2 email addresses per account'); + '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); } - } + } }); export default addEmail; diff --git a/app/imports/api/users/methods/deleteMyAccount.js b/app/imports/api/users/methods/deleteMyAccount.js index f6947bfc..5c555855 100644 --- a/app/imports/api/users/methods/deleteMyAccount.js +++ b/app/imports/api/users/methods/deleteMyAccount.js @@ -1,31 +1,31 @@ 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', - validate: null, + name: 'users.deleteMyAccount', + validate: null, mixins: [RateLimiterMixin], rateLimit: { 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}, - {readers: userId}, + { writers: 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}, - {readers: userId}, + { writers: userId }, + { readers: userId }, ], }, { $pull: { @@ -57,5 +57,5 @@ Meteor.users.deleteMyAccount = new ValidatedMethod({ // delete the account Meteor.users.remove(userId); - } + } }); diff --git a/app/imports/api/users/methods/removeEmail.js b/app/imports/api/users/methods/removeEmail.js index 86ffb822..06a14281 100644 --- a/app/imports/api/users/methods/removeEmail.js +++ b/app/imports/api/users/methods/removeEmail.js @@ -3,8 +3,8 @@ import { ValidatedMethod } from 'meteor/mdg:validated-method'; import { RateLimiterMixin } from 'ddp-rate-limiter-mixin'; const removeEmail = new ValidatedMethod({ - name: 'users.removeEmail', - validate: new SimpleSchema({ + name: 'users.removeEmail', + validate: new SimpleSchema({ email: { type: String, regEx: SimpleSchema.RegEx.Email, @@ -15,23 +15,23 @@ 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){ + 'You must be logged in to remove an email address'); + if (!user.emails) { throw new Meteor.Error('No email to remove', - 'No email addresses are associated with this account'); + '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'); + 'You may not remove the last email address from your account'); } - if (Meteor.isServer){ + if (Meteor.isServer) { Accounts.removeEmail(userId, email); } - } + } }); export default removeEmail; diff --git a/app/imports/constants/PROPERTIES.js b/app/imports/constants/PROPERTIES.js index b0a91040..f3db0cbe 100644 --- a/app/imports/constants/PROPERTIES.js +++ b/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,36 +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: ['folder'], + 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'], }, @@ -126,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: [], }, @@ -182,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 }; diff --git a/app/imports/constants/STORAGE_LIMITS.js b/app/imports/constants/STORAGE_LIMITS.js index 6e116b07..cbc647e6 100644 --- a/app/imports/constants/STORAGE_LIMITS.js +++ b/app/imports/constants/STORAGE_LIMITS.js @@ -32,6 +32,7 @@ const STORAGE_LIMITS = Object.freeze({ tagCount: 64, writersCount: 20, libraryCollectionCount: 32, + pointBuyRowsCount: 32, }); export default STORAGE_LIMITS; diff --git a/app/imports/migrations/methods/getVersion.js b/app/imports/migrations/methods/getVersion.js index 8b67d5fe..fdff2ab6 100644 --- a/app/imports/migrations/methods/getVersion.js +++ b/app/imports/migrations/methods/getVersion.js @@ -10,7 +10,7 @@ const dbVersionToGitVersion = { const getVersion = new ValidatedMethod({ name: 'admin.getVersion', - validate: null, + validate: null, mixins: [RateLimiterMixin], rateLimit: { numRequests: 5, diff --git a/app/imports/migrations/methods/migrateTo.js b/app/imports/migrations/methods/migrateTo.js index f61fb9b3..98e1cf66 100644 --- a/app/imports/migrations/methods/migrateTo.js +++ b/app/imports/migrations/methods/migrateTo.js @@ -6,7 +6,7 @@ import { Migrations } from 'meteor/percolate:migrations'; const migrateTo = new ValidatedMethod({ name: 'admin.migrateTo', - validate: new SimpleSchema({ + validate: new SimpleSchema({ version: { type: SimpleSchema.oneOf( SimpleSchema.Integer, @@ -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); diff --git a/app/imports/migrations/methods/validateDatabase.js b/app/imports/migrations/methods/validateDatabase.js index c555f3c5..09138f4f 100644 --- a/app/imports/migrations/methods/validateDatabase.js +++ b/app/imports/migrations/methods/validateDatabase.js @@ -4,7 +4,7 @@ import { assertAdmin } from '/imports/api/sharing/sharingPermissions.js'; const validateDatabase = new ValidatedMethod({ name: 'validateDatabase', - validate: null, + validate: null, mixins: [RateLimiterMixin], rateLimit: { numRequests: 1, @@ -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}); - } catch (e){ + schema.validate(cleanDoc, { modifier: false }); + } catch (e) { console.log(collection.name, doc._id, e.message || e.reason || e.toString()); } }); diff --git a/app/imports/parser/functions.js b/app/imports/parser/functions.js index b0d16561..90a7e8df 100644 --- a/app/imports/parser/functions.js +++ b/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){ diff --git a/app/imports/parser/grammar.js b/app/imports/parser/grammar.js index d8a449f8..ec217527 100644 --- a/app/imports/parser/grammar.js +++ b/app/imports/parser/grammar.js @@ -4,7 +4,7 @@ function id(x) { return x[0]; } import node from './parseTree/_index.js'; - import moo from 'moo'; + import moo from 'moo'; const lexer = moo.compile({ number: /[0-9]+(?:\.[0-9]+)?/, diff --git a/app/imports/parser/grammar.ne b/app/imports/parser/grammar.ne index e2f7d1bf..51d1ece2 100644 --- a/app/imports/parser/grammar.ne +++ b/app/imports/parser/grammar.ne @@ -2,7 +2,7 @@ @{% import node from './parseTree/_index.js'; - import moo from 'moo'; + import moo from 'moo'; const lexer = moo.compile({ number: /[0-9]+(?:\.[0-9]+)?/, diff --git a/app/imports/parser/parseTree/index.js b/app/imports/parser/parseTree/index.js index 64f9945c..d866cc38 100644 --- a/app/imports/parser/parseTree/index.js +++ b/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}) { - return { + create({ array, index }) { + return { parseType: 'index', array, index, } }, - resolve(fn, node, scope, context){ - let {result: index} = resolve(fn, node.index, scope, context); - let {result: array} = resolve(fn, node.array, scope, context); + resolve(fn, node, scope, context) { + let { result: index } = resolve(fn, node.index, 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'){ - if (array.parseType !== 'array'){ + } else if (fn === 'reduce') { + 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); } diff --git a/app/imports/parser/parseTree/rollArray.js b/app/imports/parser/parseTree/rollArray.js index d8b0c016..969b948d 100644 --- a/app/imports/parser/parseTree/rollArray.js +++ b/app/imports/parser/parseTree/rollArray.js @@ -1,24 +1,24 @@ import constant from './constant.js'; const rollArray = { - create({values, diceSize, diceNum}) { - return { + create({ values, diceSize, diceNum }) { + return { parseType: 'rollArray', values, diceSize, 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({ diff --git a/app/imports/server/action.js b/app/imports/server/action.js new file mode 100644 index 00000000..e69de29b diff --git a/app/imports/server/cron/deleteSoftRemovedDocuments.js b/app/imports/server/cron/deleteSoftRemovedDocuments.js index 835e3773..b22d0293 100644 --- a/app/imports/server/cron/deleteSoftRemovedDocuments.js +++ b/app/imports/server/cron/deleteSoftRemovedDocuments.js @@ -4,47 +4,47 @@ import { assertAdmin } from '/imports/api/sharing/sharingPermissions.js'; import { SyncedCron } from 'meteor/littledata:synced-cron'; Meteor.startup(() => { - const collections = [ - CreatureProperties, + const collections = [ + CreatureProperties, LibraryNodes, - ]; + ]; - /** - * Deletes all soft removed documents that were removed more than 1 day ago - * and were not restored - * @return {Number} Number of documents removed - */ - const deleteOldSoftRemovedDocs = function(){ - const now = new Date(); + /** + * Deletes all soft removed documents that were removed more than 1 day ago + * and were not restored + * @return {Number} Number of documents removed + */ + 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 - }, function(error){ - if (error){ - console.error(JSON.stringify(error, null, 2)); - } - }); - }); - }; + collections.forEach(collection => { + collection.remove({ + removed: true, + removedAt: { $lt: yesterday } // dates *before* yesterday + }, function (error) { + if (error) { + console.error(JSON.stringify(error, null, 2)); + } + }); + }); + }; - SyncedCron.add({ - name: 'deleteSoftRemovedDocs', - schedule: function(parser) { - return parser.text('every 10 minutes'); - }, - job: deleteOldSoftRemovedDocs, - }); + SyncedCron.add({ + name: 'deleteSoftRemovedDocs', + schedule: function (parser) { + return parser.text('every 10 minutes'); + }, + job: deleteOldSoftRemovedDocs, + }); - SyncedCron.start(); + SyncedCron.start(); - // Add a method to manually trigger removal - Meteor.methods({ - deleteOldSoftRemovedDocs() { + // Add a method to manually trigger removal + Meteor.methods({ + deleteOldSoftRemovedDocs() { assertAdmin(this.userId); - this.unblock(); - deleteOldSoftRemovedDocs(); - }, - }); + this.unblock(); + deleteOldSoftRemovedDocs(); + }, + }); }); diff --git a/app/imports/server/publications/docs.js b/app/imports/server/publications/docs.js new file mode 100644 index 00000000..b887a081 --- /dev/null +++ b/app/imports/server/publications/docs.js @@ -0,0 +1,34 @@ +import { propsByDocsPath } from '/imports/constants/PROPERTIES.js'; + + +// Manual doc paths +const docPaths = [ + 'computed-fields', + 'inline-calculations', + 'dependency-loops', + 'docs', + 'tags', +]; +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(); +}); diff --git a/app/imports/server/publications/icons.js b/app/imports/server/publications/icons.js index a289fdcf..fc5313a2 100644 --- a/app/imports/server/publications/icons.js +++ b/app/imports/server/publications/icons.js @@ -1,16 +1,16 @@ import Icons from '/imports/api/icons/Icons.js'; -Meteor.publish('sampleIcons', function(){ - return Icons.find({}, {limit: 50}); +Meteor.publish('sampleIcons', function () { + 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: { diff --git a/app/imports/server/publications/index.js b/app/imports/server/publications/index.js index eba626eb..bb74b5b5 100644 --- a/app/imports/server/publications/index.js +++ b/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'; diff --git a/app/imports/server/publications/users.js b/app/imports/server/publications/users.js index f096ccd2..b6e59e82 100644 --- a/app/imports/server/publications/users.js +++ b/app/imports/server/publications/users.js @@ -2,31 +2,33 @@ import SimpleSchema from 'simpl-schema'; import '/imports/api/users/Users.js'; import Invites from '/imports/api/users/Invites.js'; -Meteor.publish('user', function(){ - return [ - Meteor.users.find(this.userId, {fields: { - roles: 1, - username: 1, - apiKey: 1, - darkMode: 1, - subscribedLibraries: 1, - subscribedLibraryCollections: 1, - fileStorageUsed: 1, - profile: 1, - preferences: 1, - 'services.patreon.id': 1, - 'services.patreon.entitledCents': 1, - 'services.patreon.entitledCentsOverride': 1, - 'services.google.id': 1, - 'services.google.picture': 1, - 'services.google.name': 1, - 'services.google.email': 1, - 'services.google.locale': 1, - }}), +Meteor.publish('user', function () { + return [ + Meteor.users.find(this.userId, { + fields: { + roles: 1, + username: 1, + apiKey: 1, + darkMode: 1, + subscribedLibraries: 1, + subscribedLibraryCollections: 1, + fileStorageUsed: 1, + profile: 1, + preferences: 1, + 'services.patreon.id': 1, + 'services.patreon.entitledCents': 1, + 'services.patreon.entitledCentsOverride': 1, + 'services.google.id': 1, + 'services.google.picture': 1, + 'services.google.name': 1, + 'services.google.email': 1, + 'services.google.locale': 1, + } + }), Invites.find({ $or: [ - {inviter: this.userId}, - {invitee: this.userId} + { inviter: 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){ - userIdsSchema.validate({ids}); - if (!this.userId || !ids) return this.ready(); - return Meteor.users.find({ - _id: {$in: ids} - },{ - fields: {username: 1}, - sort: {username: 1}, - }); +Meteor.publish('userPublicProfiles', function (ids) { + userIdsSchema.validate({ ids }); + if (!this.userId || !ids) return this.ready(); + return Meteor.users.find({ + _id: { $in: ids } + }, { + fields: { username: 1 }, + sort: { username: 1 }, + }); }); diff --git a/app/imports/server/rest/apiPublications/creature.js b/app/imports/server/rest/apiPublications/creature.js index f805c92b..a35ae634 100644 --- a/app/imports/server/rest/apiPublications/creature.js +++ b/app/imports/server/rest/apiPublications/creature.js @@ -1,6 +1,7 @@ import SimpleSchema from 'simpl-schema'; import Creatures from '/imports/api/creature/creatures/Creatures.js'; import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js'; +import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables'; import { assertViewPermission } from '/imports/api/creature/creatures/creaturePermissions.js'; import computeCreature from '/imports/api/engine/computeCreature.js'; import VERSION from '/imports/constants/VERSION.js'; @@ -40,6 +41,9 @@ Meteor.publish('api-creature', function(creatureId){ CreatureProperties.find({ 'ancestors.id': creatureId, }), + CreatureVariables.find({ + _creatureId: creatureId, + }), ]; }, { url: 'api/creature/:0' diff --git a/app/imports/ui/components/ColumnLayout.vue b/app/imports/ui/components/ColumnLayout.vue index de3e1448..8d3fc918 100644 --- a/app/imports/ui/components/ColumnLayout.vue +++ b/app/imports/ui/components/ColumnLayout.vue @@ -19,34 +19,39 @@ export default { diff --git a/app/imports/ui/components/IncrementMenu.vue b/app/imports/ui/components/IncrementMenu.vue index 6a2b954c..99c2de58 100644 --- a/app/imports/ui/components/IncrementMenu.vue +++ b/app/imports/ui/components/IncrementMenu.vue @@ -65,102 +65,103 @@ diff --git a/app/imports/ui/components/MarkdownText.vue b/app/imports/ui/components/MarkdownText.vue index ab9d35b2..bb133d27 100644 --- a/app/imports/ui/components/MarkdownText.vue +++ b/app/imports/ui/components/MarkdownText.vue @@ -1,26 +1,27 @@ diff --git a/app/imports/ui/components/ToolbarCard.vue b/app/imports/ui/components/ToolbarCard.vue index 099a674a..9187bdf9 100644 --- a/app/imports/ui/components/ToolbarCard.vue +++ b/app/imports/ui/components/ToolbarCard.vue @@ -27,54 +27,58 @@ diff --git a/app/imports/ui/components/global/IconPicker.vue b/app/imports/ui/components/global/IconPicker.vue index 9d7dbc2b..13ef7954 100644 --- a/app/imports/ui/components/global/IconPicker.vue +++ b/app/imports/ui/components/global/IconPicker.vue @@ -87,7 +87,7 @@ export default { SvgIcon, }, mixins: [SmartInput], - props: { + props: { label: { type: String, default: 'Icon', @@ -96,39 +96,42 @@ export default { type: String, default: undefined, }, - }, - data(){return { - menu: false, - searchString: '', - icons: [], - };}, + }, + data() { + return { + menu: false, + searchString: '', + icons: [], + }; + }, watch: { - menu(value){ - if (value){ + menu(value) { + if (value) { setTimeout(() => { - if (this.$refs.iconSearchField){ + if (this.$refs.iconSearchField) { this.$refs.iconSearchField.$children[0].focus(); } }, 100); } }, }, - methods: { - search(value, ack){ + methods: { + 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); }, - }, + }, } diff --git a/app/imports/ui/components/global/SmartBtn.vue b/app/imports/ui/components/global/SmartBtn.vue new file mode 100644 index 00000000..324fcf3e --- /dev/null +++ b/app/imports/ui/components/global/SmartBtn.vue @@ -0,0 +1,72 @@ + + + diff --git a/app/imports/ui/components/global/SmartCombobox.vue b/app/imports/ui/components/global/SmartCombobox.vue index 07931531..d5c985c0 100644 --- a/app/imports/ui/components/global/SmartCombobox.vue +++ b/app/imports/ui/components/global/SmartCombobox.vue @@ -21,34 +21,36 @@ diff --git a/app/imports/ui/components/global/SmartInputMixin.js b/app/imports/ui/components/global/SmartInputMixin.js index 5e44cc7b..245656b6 100644 --- a/app/imports/ui/components/global/SmartInputMixin.js +++ b/app/imports/ui/components/global/SmartInputMixin.js @@ -13,16 +13,18 @@ export default { context: { default: {} } }, inheritAttrs: false, - data(){ return { - error: false, - ackErrors: null, - rulesErrors: null, - focused: false, - loading: false, - dirty: false, - safeValue: this.value, - inputValue: this.value, - };}, + data() { + return { + error: false, + ackErrors: null, + rulesErrors: null, + focused: false, + loading: false, + 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){ - this.ackErrors = null; - } else if (typeof error === 'string'){ - this.ackErrors = error; - } else if (error.reason){ + if (!error) { + this.ackErrors = null; + } else if (typeof error === 'string') { + this.ackErrors = error; + } 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); - } + this.ackErrors = 'Something went wrong' + console.error(error); + } }, - change(val){ + change(val) { this.dirty = true; - if (this.hasChangeListener) this.loading = 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(); }, }; diff --git a/app/imports/ui/components/global/SmartSelect.vue b/app/imports/ui/components/global/SmartSelect.vue index 439f735b..005ea2ae 100644 --- a/app/imports/ui/components/global/SmartSelect.vue +++ b/app/imports/ui/components/global/SmartSelect.vue @@ -23,9 +23,9 @@ diff --git a/app/imports/ui/components/global/SmartSlider.vue b/app/imports/ui/components/global/SmartSlider.vue new file mode 100644 index 00000000..b9797d9b --- /dev/null +++ b/app/imports/ui/components/global/SmartSlider.vue @@ -0,0 +1,34 @@ + + + diff --git a/app/imports/ui/components/global/TextArea.vue b/app/imports/ui/components/global/TextArea.vue index 40722679..2fe4f8c8 100644 --- a/app/imports/ui/components/global/TextArea.vue +++ b/app/imports/ui/components/global/TextArea.vue @@ -14,15 +14,15 @@ diff --git a/app/imports/ui/components/global/globalIndex.js b/app/imports/ui/components/global/globalIndex.js index 05992177..84c28bbe 100644 --- a/app/imports/ui/components/global/globalIndex.js +++ b/app/imports/ui/components/global/globalIndex.js @@ -5,17 +5,21 @@ import IconPicker from '/imports/ui/components/global/IconPicker.vue'; import TextField from '/imports/ui/components/global/TextField.vue'; import TextArea from '/imports/ui/components/global/TextArea.vue'; import SmartSelect from '/imports/ui/components/global/SmartSelect.vue'; +import SmartBtn from '/imports/ui/components/global/SmartBtn.vue'; import SmartCombobox from '/imports/ui/components/global/SmartCombobox.vue'; import SmartCheckbox from '/imports/ui/components/global/SmartCheckbox.vue'; import SmartSwitch from '/imports/ui/components/global/SmartSwitch.vue'; import SvgIcon from '/imports/ui/components/global/SvgIcon.vue'; +import SmartSlider from '/imports/ui/components/global/SmartSlider.vue'; Vue.component('DatePicker', DatePicker); Vue.component('IconPicker', IconPicker); Vue.component('TextField', TextField); Vue.component('TextArea', TextArea); Vue.component('SmartSelect', SmartSelect); +Vue.component('SmartBtn', SmartBtn); Vue.component('SmartCombobox', SmartCombobox); Vue.component('SmartCheckbox', SmartCheckbox); +Vue.component('SmartSlider', SmartSlider); Vue.component('SmartSwitch', SmartSwitch); Vue.component('SvgIcon', SvgIcon); diff --git a/app/imports/ui/components/propertyToolbar.vue b/app/imports/ui/components/propertyToolbar.vue index 36b24414..28b454d7 100644 --- a/app/imports/ui/components/propertyToolbar.vue +++ b/app/imports/ui/components/propertyToolbar.vue @@ -54,6 +54,19 @@ + + + + Help + + + + mdi-help + + diff --git a/app/imports/ui/components/tree/TreeNode.vue b/app/imports/ui/components/tree/TreeNode.vue index 4579c441..c17b435a 100644 --- a/app/imports/ui/components/tree/TreeNode.vue +++ b/app/imports/ui/components/tree/TreeNode.vue @@ -77,134 +77,149 @@ diff --git a/app/imports/ui/components/tree/TreeNodeList.vue b/app/imports/ui/components/tree/TreeNodeList.vue index f5915ca2..1ea59678 100644 --- a/app/imports/ui/components/tree/TreeNodeList.vue +++ b/app/imports/ui/components/tree/TreeNodeList.vue @@ -33,102 +33,112 @@ diff --git a/app/imports/ui/creature/CreatureForm.vue b/app/imports/ui/creature/CreatureForm.vue index 1a0f82e0..d2ea8eeb 100644 --- a/app/imports/ui/creature/CreatureForm.vue +++ b/app/imports/ui/creature/CreatureForm.vue @@ -67,25 +67,25 @@ :value="model.settings.discordWebhook" @change="(value, ack) => $emit('change', {path: ['settings','discordWebhook'], value, ack})" /> - @@ -121,41 +121,42 @@ diff --git a/app/imports/ui/creature/CreatureFormDialog.vue b/app/imports/ui/creature/CreatureFormDialog.vue index 9a80adce..04fa4d19 100644 --- a/app/imports/ui/creature/CreatureFormDialog.vue +++ b/app/imports/ui/creature/CreatureFormDialog.vue @@ -1,5 +1,8 @@ diff --git a/app/imports/ui/creature/experiences/ExperienceInsertDialog.vue b/app/imports/ui/creature/experiences/ExperienceInsertDialog.vue index 28756d1f..9b9ecc72 100644 --- a/app/imports/ui/creature/experiences/ExperienceInsertDialog.vue +++ b/app/imports/ui/creature/experiences/ExperienceInsertDialog.vue @@ -34,9 +34,9 @@ import schemaFormMixin from '/imports/ui/properties/forms/shared/schemaFormMixin export default { components: { - DialogBase, + DialogBase, ExperienceForm, - }, + }, mixins: [schemaFormMixin], provide: { context: { @@ -52,10 +52,10 @@ export default { type: Boolean, }, }, - data(){ + data() { let schema = ExperienceSchema.omit('creatureId'); let startingModel = {}; - if (this.startAsMilestone){ + if (this.startAsMilestone) { startingModel.levels = 1; } return { @@ -65,14 +65,14 @@ export default { debounceTime: 0, }; }, - methods:{ - insertExperience(){ + methods: { + insertExperience() { let experience = this.schema.clean(this.model); let id = insertExperience.call({ experience, creatureIds: this.creatureIds, - }, (error) => { - if (error){ + }, (error) => { + if (error) { console.error(error); } }); @@ -83,4 +83,5 @@ export default { diff --git a/app/imports/ui/creature/slots/LevelUpDialog.vue b/app/imports/ui/creature/slots/LevelUpDialog.vue index 7a09eb1b..4503a96e 100644 --- a/app/imports/ui/creature/slots/LevelUpDialog.vue +++ b/app/imports/ui/creature/slots/LevelUpDialog.vue @@ -192,18 +192,17 @@ import getSlotFillFilter from '/imports/api/creature/creatureProperties/methods/ import Libraries from '/imports/api/library/Libraries.js'; import LibraryNodeExpansionContent from '/imports/ui/library/LibraryNodeExpansionContent.vue'; import PropertyTags from '/imports/ui/properties/viewers/shared/PropertyTags.vue'; -import { getPropertyName } from '/imports/constants/PROPERTIES.js'; import { clone } from 'lodash'; export default { components: { - DialogBase, + DialogBase, TreeNodeView, PropertyDescription, LibraryNodeExpansionContent, PropertyTags, - }, - props:{ + }, + props: { classId: { type: String, default: undefined, @@ -217,42 +216,44 @@ export default { default: undefined, }, }, - data(){return { - selectedNodeIds: [], - searchInput: undefined, - searchValue: undefined, - showDisabled: false, - disabledNodeCount: undefined, - }}, + data() { + return { + selectedNodeIds: [], + searchInput: undefined, + searchValue: undefined, + showDisabled: false, + disabledNodeCount: undefined, + } + }, reactiveProvide: { name: 'context', include: ['creatureId'], }, computed: { - tagsSearched(){ + tagsSearched() { let or = []; let not = []; - if (this.model.slotTags && this.model.slotTags.length){ + if (this.model.slotTags && this.model.slotTags.length) { or.push(this.model.slotTags); } this.model.extraTags?.forEach(extras => { - if (extras.tags?.length){ - if(extras.operation === 'OR'){ + if (extras.tags?.length) { + if (extras.operation === 'OR') { or.push(extras.tags); - } else if (extras.operation === 'NOT'){ + } else if (extras.operation === 'NOT') { not.push(extras.tags); } } }); - return {or, not}; + return { or, not }; }, }, methods: { - loadMore(){ + loadMore() { if (this.currentLimit >= this.countAll) return; this._subs['classFillers'].setData('limit', this.currentLimit + 50); }, - openPropertyDetails(id){ + openPropertyDetails(id) { this.$store.commit('pushDialogStack', { component: 'library-node-dialog', elementId: id, @@ -261,26 +262,26 @@ export default { }, }); }, - isDisabled(node){ + isDisabled(node) { return node._disabledBySlotFillerCondition || node._disabledByAlreadyAdded || - ( - node._disabledByQuantityFilled && - !this.selectedNodeIds.includes(node._id) - ) + ( + node._disabledByQuantityFilled && + !this.selectedNodeIds.includes(node._id) + ) }, }, meteor: { $subscribe: { - 'classFillers'(){ + 'classFillers'() { return [this.classId, this.searchValue || undefined] }, }, - searchLoading(){ + searchLoading() { return !!this.searchValue && !this.$subReady.classFillers; }, - model(){ - if (this.classId){ + model() { + if (this.classId) { return CreatureProperties.findOne(this.classId); } else if (this.dummySlot) { let model = clone(this.dummySlot) @@ -294,40 +295,40 @@ export default { if (!this.creatureId) return {}; return CreatureVariables.findOne({ _creatureId: this.creatureId }) || {}; }, - currentLimit(){ + currentLimit() { return this._subs['classFillers'].data('limit') || 50; }, - countAll(){ + countAll() { return this._subs['classFillers'].data('countAll'); }, - alreadyAdded(){ + alreadyAdded() { let added = new Set(); if (!this.model.unique) return added; let ancestorId; - if (this.model.unique === 'uniqueInSlot'){ + if (this.model.unique === 'uniqueInSlot') { ancestorId = this.model._id; - } else if (this.model.unique === 'uniqueInCreature'){ + } else if (this.model.unique === 'uniqueInCreature') { ancestorId = this.creatureId; } CreatureProperties.find({ 'ancestors.id': ancestorId, - libraryNodeId: {$exists: true}, - removed: {$ne: true}, + libraryNodeId: { $exists: true }, + removed: { $ne: true }, }, { - fields: {libraryNodeId: 1}, + fields: { libraryNodeId: 1 }, }).forEach(prop => { added.add(prop.libraryNodeId); }); return added; }, - totalQuantitySelected(){ + totalQuantitySelected() { let quantitySelected = 0; LibraryNodes.find({ - _id: {$in: this.selectedNodeIds} + _id: { $in: this.selectedNodeIds } }, { - fields: {slotQuantityFilled: 1}, + fields: { slotQuantityFilled: 1 }, }).forEach(node => { - if (Number.isFinite(node.slotQuantityFilled)){ + if (Number.isFinite(node.slotQuantityFilled)) { quantitySelected += node.slotQuantityFilled; } else { quantitySelected += 1; @@ -335,30 +336,30 @@ export default { }); return quantitySelected; }, - spaceLeft(){ + spaceLeft() { if (!this.model.quantityExpected || this.model.quantityExpected.value === 0) return undefined; return this.model.spaceLeft - this.totalQuantitySelected; }, - libraryNames(){ + libraryNames() { let names = {}; Libraries.find().forEach(lib => names[lib._id] = lib.name) return names; }, - libraryNodes(){ + libraryNodes() { let filter = getSlotFillFilter({ slot: this.model }); let nodes = LibraryNodes.find(filter, { - sort: {name: 1, order: 1} + sort: { name: 1, order: 1 } }).fetch(); let disabledNodeCount = 0; // Mark classFillers whose condition isn't met or are too big to fit // the quantity to fill nodes.forEach(node => { - if (node.slotFillerCondition){ + if (node.slotFillerCondition) { try { let parseNode = parse(node.slotFillerCondition); - const {result: resultNode} = resolve('reduce', parseNode, this.variables); - if (resultNode?.parseType === 'constant'){ - if (!resultNode.value){ + const { result: resultNode } = resolve('reduce', parseNode, this.variables); + if (resultNode?.parseType === 'constant') { + if (!resultNode.value) { node._disabledBySlotFillerCondition = true; disabledNodeCount += 1; } @@ -367,7 +368,7 @@ export default { node._conditionError = toString(resultNode); disabledNodeCount += 1; } - } catch (e){ + } catch (e) { console.warn(e); let error = prettifyParseError(e); node._disabledBySlotFillerCondition = true; @@ -378,10 +379,10 @@ export default { let quantityToFill = node.type === 'slotFiller' ? node.slotQuantityFilled : 1; if ( quantityToFill > this.spaceLeft - ){ + ) { node._disabledByQuantityFilled = true; } - if (this.alreadyAdded.has(node._id)){ + if (this.alreadyAdded.has(node._id)) { node._disabledByAlreadyAdded = true; } }); @@ -393,7 +394,7 @@ export default { diff --git a/app/imports/ui/creature/slots/SlotCard.vue b/app/imports/ui/creature/slots/SlotCard.vue index 73c52813..44f6ab76 100644 --- a/app/imports/ui/creature/slots/SlotCard.vue +++ b/app/imports/ui/creature/slots/SlotCard.vue @@ -62,8 +62,10 @@ export default { hover: false, }}, computed: { - accentColor(){ - if (this.theme.isDark){ + accentColor() { + if (this.model.color) { + return this.model.color + } else if (this.theme.isDark){ return this.$vuetify.theme.themes.dark.primary; } else { return this.$vuetify.theme.themes.light.primary; diff --git a/app/imports/ui/creature/slots/SlotCardsToFill.vue b/app/imports/ui/creature/slots/SlotCardsToFill.vue index 2c2d873c..043489e7 100644 --- a/app/imports/ui/creature/slots/SlotCardsToFill.vue +++ b/app/imports/ui/creature/slots/SlotCardsToFill.vue @@ -5,6 +5,18 @@ leave-absolute hide-on-leave > +
+ +
@@ -24,6 +36,7 @@ diff --git a/app/imports/ui/creature/slots/SlotFillDialog.vue b/app/imports/ui/creature/slots/SlotFillDialog.vue index caee497e..cbad8fb9 100644 --- a/app/imports/ui/creature/slots/SlotFillDialog.vue +++ b/app/imports/ui/creature/slots/SlotFillDialog.vue @@ -198,13 +198,13 @@ import { clone } from 'lodash'; export default { components: { - DialogBase, + DialogBase, TreeNodeView, PropertyDescription, LibraryNodeExpansionContent, PropertyTags, - }, - props:{ + }, + props: { slotId: { type: String, default: undefined, @@ -218,36 +218,38 @@ export default { default: undefined, }, }, - data(){return { - selectedNodeIds: [], - searchInput: undefined, - searchValue: undefined, - showDisabled: false, - disabledNodeCount: undefined, - }}, + data() { + return { + selectedNodeIds: [], + searchInput: undefined, + searchValue: undefined, + showDisabled: false, + disabledNodeCount: undefined, + } + }, reactiveProvide: { name: 'context', include: ['creatureId'], }, computed: { - tagsSearched(){ + tagsSearched() { let or = []; let not = []; - if (this.model.slotTags && this.model.slotTags.length){ + if (this.model.slotTags && this.model.slotTags.length) { or.push(this.model.slotTags); } this.model.extraTags?.forEach(extras => { - if (extras.tags?.length){ - if(extras.operation === 'OR'){ + if (extras.tags?.length) { + if (extras.operation === 'OR') { or.push(extras.tags); - } else if (extras.operation === 'NOT'){ + } else if (extras.operation === 'NOT') { not.push(extras.tags); } } }); - return {or, not}; + return { or, not }; }, - slotPropertyTypeName(){ + slotPropertyTypeName() { if (!this.model) return; if (!this.model.slotType) return 'Property'; let propName = getPropertyName(this.model.slotType); @@ -255,11 +257,11 @@ export default { }, }, methods: { - loadMore(){ + loadMore() { if (this.currentLimit >= this.countAll) return; this._subs['slotFillers'].setData('limit', this.currentLimit + 50); }, - openPropertyDetails(id){ + openPropertyDetails(id) { this.$store.commit('pushDialogStack', { component: 'library-node-dialog', elementId: id, @@ -268,26 +270,26 @@ export default { }, }); }, - isDisabled(node){ + isDisabled(node) { return node._disabledBySlotFillerCondition || node._disabledByAlreadyAdded || - ( - node._disabledByQuantityFilled && - !this.selectedNodeIds.includes(node._id) - ) + ( + node._disabledByQuantityFilled && + !this.selectedNodeIds.includes(node._id) + ) }, }, meteor: { $subscribe: { - 'slotFillers'(){ + 'slotFillers'() { return [this.slotId, this.searchValue || undefined] }, }, - searchLoading(){ + searchLoading() { return !!this.searchValue && !this.$subReady.slotFillers; }, - model(){ - if (this.slotId){ + model() { + if (this.slotId) { return CreatureProperties.findOne(this.slotId); } else if (this.dummySlot) { let model = clone(this.dummySlot) @@ -301,40 +303,40 @@ export default { if (!this.creatureId) return {}; return CreatureVariables.findOne({ _creatureId: this.creatureId }) || {}; }, - currentLimit(){ + currentLimit() { return this._subs['slotFillers'].data('limit') || 50; }, - countAll(){ + countAll() { return this._subs['slotFillers'].data('countAll'); }, - alreadyAdded(){ + alreadyAdded() { let added = new Set(); if (!this.model.unique) return added; let ancestorId; - if (this.model.unique === 'uniqueInSlot'){ + if (this.model.unique === 'uniqueInSlot') { ancestorId = this.model._id; - } else if (this.model.unique === 'uniqueInCreature'){ + } else if (this.model.unique === 'uniqueInCreature') { ancestorId = this.creatureId; } CreatureProperties.find({ 'ancestors.id': ancestorId, - libraryNodeId: {$exists: true}, - removed: {$ne: true}, + libraryNodeId: { $exists: true }, + removed: { $ne: true }, }, { - fields: {libraryNodeId: 1}, + fields: { libraryNodeId: 1 }, }).forEach(prop => { added.add(prop.libraryNodeId); }); return added; }, - totalQuantitySelected(){ + totalQuantitySelected() { let quantitySelected = 0; LibraryNodes.find({ - _id: {$in: this.selectedNodeIds} + _id: { $in: this.selectedNodeIds } }, { - fields: {slotQuantityFilled: 1}, + fields: { slotQuantityFilled: 1 }, }).forEach(node => { - if (Number.isFinite(node.slotQuantityFilled)){ + if (Number.isFinite(node.slotQuantityFilled)) { quantitySelected += node.slotQuantityFilled; } else { quantitySelected += 1; @@ -342,30 +344,30 @@ export default { }); return quantitySelected; }, - spaceLeft(){ + spaceLeft() { if (!this.model.quantityExpected || this.model.quantityExpected.value === 0) return undefined; return this.model.spaceLeft - this.totalQuantitySelected; }, - libraryNames(){ + libraryNames() { let names = {}; Libraries.find().forEach(lib => names[lib._id] = lib.name) return names; }, - libraryNodes(){ - let filter = getSlotFillFilter({slot: this.model}); + libraryNodes() { + let filter = getSlotFillFilter({ slot: this.model }); let nodes = LibraryNodes.find(filter, { - sort: {name: 1, order: 1} + sort: { name: 1, order: 1 } }).fetch(); let disabledNodeCount = 0; // Mark slotFillers whose condition isn't met or are too big to fit // the quantity to fill nodes.forEach(node => { - if (node.slotFillerCondition){ + if (node.slotFillerCondition) { try { let parseNode = parse(node.slotFillerCondition); - const {result: resultNode} = resolve('reduce', parseNode, this.variables); - if (resultNode?.parseType === 'constant'){ - if (!resultNode.value){ + const { result: resultNode } = resolve('reduce', parseNode, this.variables); + if (resultNode?.parseType === 'constant') { + if (!resultNode.value) { node._disabledBySlotFillerCondition = true; disabledNodeCount += 1; } @@ -374,7 +376,7 @@ export default { node._conditionError = toString(resultNode); disabledNodeCount += 1; } - } catch (e){ + } catch (e) { console.warn(e); let error = prettifyParseError(e); node._disabledBySlotFillerCondition = true; @@ -385,10 +387,10 @@ export default { let quantityToFill = node.type === 'slotFiller' ? node.slotQuantityFilled : 1; if ( quantityToFill > this.spaceLeft - ){ + ) { node._disabledByQuantityFilled = true; } - if (this.alreadyAdded.has(node._id)){ + if (this.alreadyAdded.has(node._id)) { node._disabledByAlreadyAdded = true; } }); @@ -400,7 +402,7 @@ export default { diff --git a/app/imports/ui/dialogStack/DeleteConfirmationDialog.vue b/app/imports/ui/dialogStack/DeleteConfirmationDialog.vue index d7f90460..c8b76735 100644 --- a/app/imports/ui/dialogStack/DeleteConfirmationDialog.vue +++ b/app/imports/ui/dialogStack/DeleteConfirmationDialog.vue @@ -4,7 +4,10 @@ Delete {{ typeName }}
- + This can't be undone

@@ -12,9 +15,9 @@

diff --git a/app/imports/ui/dialogStack/DialogBase.vue b/app/imports/ui/dialogStack/DialogBase.vue index 14a1f1cf..4fcdd912 100644 --- a/app/imports/ui/dialogStack/DialogBase.vue +++ b/app/imports/ui/dialogStack/DialogBase.vue @@ -50,63 +50,69 @@ diff --git a/app/imports/ui/dialogStack/DialogComponentIndex.js b/app/imports/ui/dialogStack/DialogComponentIndex.js index c8079709..ef89fc6a 100644 --- a/app/imports/ui/dialogStack/DialogComponentIndex.js +++ b/app/imports/ui/dialogStack/DialogComponentIndex.js @@ -1,18 +1,26 @@ -const AddCreaturePropertyDialog = () => import('/imports/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue'); +// Load commonly used dialogs immediately +import AddCreaturePropertyDialog from '/imports/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue'; +import CharacterCreationDialog from '/imports/ui/creature/character/CharacterCreationDialog.vue'; +import CastSpellWithSlotDialog from '/imports/ui/properties/components/spells/CastSpellWithSlotDialog.vue'; +import CreatureFormDialog from '/imports/ui/creature/CreatureFormDialog.vue'; +import CreaturePropertyCreationDialog from '/imports/ui/creature/creatureProperties/CreaturePropertyCreationDialog.vue'; +import CreaturePropertyDialog from '/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue'; +import CreaturePropertyFromLibraryDialog from '/imports/ui/creature/creatureProperties/CreaturePropertyFromLibraryDialog.vue'; +import CreatureRootDialog from '/imports/ui/creature/character/CreatureRootDialog.vue'; +import DeleteConfirmationDialog from '/imports/ui/dialogStack/DeleteConfirmationDialog.vue'; +import ExperienceInsertDialog from '/imports/ui/creature/experiences/ExperienceInsertDialog.vue'; +import ExperienceListDialog from '/imports/ui/creature/experiences/ExperienceListDialog.vue'; +import HelpDialog from '/imports/ui/dialogStack/HelpDialog.vue'; +import LevelUpDialog from '/imports/ui/creature/slots/LevelUpDialog.vue'; +import SelectLibraryNodeDialog from '/imports/ui/library/SelectLibraryNodeDialog.vue'; +import SlotFillDialog from '/imports/ui/creature/slots/SlotFillDialog.vue'; +import TierTooLowDialog from '/imports/ui/user/TierTooLowDialog.vue'; +import TransferOwnershipDialog from '/imports/ui/sharing/TransferOwnershipDialog.vue'; + +// Lazily load less common dialogs const ArchiveDialog = () => import('/imports/ui/creature/archive/ArchiveDialog.vue'); -const CharacterCreationDialog = () => import('/imports/ui/creature/character/CharacterCreationDialog.vue'); -const CastSpellWithSlotDialog = () => import('/imports/ui/properties/components/spells/CastSpellWithSlotDialog.vue'); -const CreatureFormDialog = () => import('/imports/ui/creature/CreatureFormDialog.vue'); -const CreaturePropertyCreationDialog = () => import('/imports/ui/creature/creatureProperties/CreaturePropertyCreationDialog.vue'); -const CreaturePropertyDialog = () => import('/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue'); -const CreaturePropertyFromLibraryDialog = () => import('/imports/ui/creature/creatureProperties/CreaturePropertyFromLibraryDialog.vue'); -const CreatureRootDialog = () => import('/imports/ui/creature/character/CreatureRootDialog.vue'); -const DeleteConfirmationDialog = () => import('/imports/ui/dialogStack/DeleteConfirmationDialog.vue'); const DeleteUserAccountDialog = () => import('/imports/ui/user/DeleteUserAccountDialog.vue'); -const ExperienceInsertDialog = () => import( '/imports/ui/creature/experiences/ExperienceInsertDialog.vue'); -const ExperienceListDialog = () => import( '/imports/ui/creature/experiences/ExperienceListDialog.vue'); const InviteDialog = () => import('/imports/ui/user/InviteDialog.vue'); -const LevelUpDialog = () => import('/imports/ui/creature/slots/LevelUpDialog.vue'); const LibraryCollectionCreationDialog = () => import('/imports/ui/library/LibraryCollectionCreationDialog.vue'); const LibraryCollectionEditDialog = () => import('/imports/ui/library/LibraryCollectionEditDialog.vue'); const LibraryCreationDialog = () => import('/imports/ui/library/LibraryCreationDialog.vue'); @@ -21,11 +29,7 @@ const LibraryNodeCreationDialog = () => import('/imports/ui/library/LibraryNodeC const LibraryNodeDialog = () => import('/imports/ui/library/LibraryNodeDialog.vue'); const MoveLibraryNodeDialog = () => import('/imports/ui/library/MoveLibraryNodeDialog.vue'); const SelectCreaturesDialog = () => import('/imports/ui/tabletop/SelectCreaturesDialog.vue'); -const SelectLibraryNodeDialog = () => import('/imports/ui/library/SelectLibraryNodeDialog.vue'); const ShareDialog = () => import('/imports/ui/sharing/ShareDialog.vue'); -const SlotFillDialog = () => import('/imports/ui/creature/slots/SlotFillDialog.vue'); -const TierTooLowDialog = () => import('/imports/ui/user/TierTooLowDialog.vue'); -const TransferOwnershipDialog = () => import('/imports/ui/sharing/TransferOwnershipDialog.vue'); const UsernameDialog = () => import('/imports/ui/user/UsernameDialog.vue'); export default { @@ -42,6 +46,7 @@ export default { DeleteUserAccountDialog, ExperienceInsertDialog, ExperienceListDialog, + HelpDialog, InviteDialog, LevelUpDialog, LibraryCollectionCreationDialog, diff --git a/app/imports/ui/dialogStack/HelpDialog.vue b/app/imports/ui/dialogStack/HelpDialog.vue new file mode 100644 index 00000000..9fe700b2 --- /dev/null +++ b/app/imports/ui/dialogStack/HelpDialog.vue @@ -0,0 +1,108 @@ + + + + + diff --git a/app/imports/ui/dialogStack/mockElement.js b/app/imports/ui/dialogStack/mockElement.js index de843514..6f179af5 100644 --- a/app/imports/ui/dialogStack/mockElement.js +++ b/app/imports/ui/dialogStack/mockElement.js @@ -2,42 +2,42 @@ import { parse, stringify } from 'css-box-shadow'; // Only supports border radius defined like "20px" or "100%" const transformedRadius = (radiusString, deltaWidth, deltaHeight) => { - if (/^\d+\.?\d*px$/.test(radiusString)){ - //The radius is defined in pixel units, so get the radius as a number - const rad = +radiusString.match(/\d+\.?\d*/)[0]; - // Set the x and y radius of the "to" element, compensating for scale - return `${rad / deltaWidth}px / ${rad / deltaHeight}px`; - } else if (/^\d+\.?\d*%$/.test(radiusString)) { - //The radius is defined as a percentage, so just use it as is - return radiusString; - } + if (/^\d+\.?\d*px$/.test(radiusString)) { + //The radius is defined in pixel units, so get the radius as a number + const rad = +radiusString.match(/\d+\.?\d*/)[0]; + // Set the x and y radius of the "to" element, compensating for scale + return `${rad / deltaWidth}px / ${rad / deltaHeight}px`; + } else if (/^\d+\.?\d*%$/.test(radiusString)) { + //The radius is defined as a percentage, so just use it as is + return radiusString; + } }; const transformedBoxShadow = (shadowString, deltaWidth, deltaHeight) => { - if (shadowString === 'none') return shadowString; - if (shadowString[0] === 'r'){ - let strings = shadowString.match(/rgba\([^)]+\)[^,]+/g); - strings = strings.map(string => { - // Move color to end - let m = string.match(/(rgba\([^)]+\))([^,]+)/); - return `${m[2].trim()} ${m[1]}`; - }); - shadowString = strings.join(', '); - } - let scaleAverage = (deltaWidth + deltaHeight) / 2; - let shadows = parse(shadowString); - shadows.forEach(shadow => { - shadow.offsetX /= deltaWidth; - shadow.offsetY /= deltaHeight; - shadow.blurRadius /= scaleAverage; - shadow.spreadRadius /= scaleAverage; - }) - return stringify(shadows); + if (shadowString === 'none') return shadowString; + if (shadowString[0] === 'r') { + let strings = shadowString.match(/rgba\([^)]+\)[^,]+/g); + strings = strings.map(string => { + // Move color to end + let m = string.match(/(rgba\([^)]+\))([^,]+)/); + return `${m[2].trim()} ${m[1]}`; + }); + shadowString = strings.join(', '); + } + let scaleAverage = (deltaWidth + deltaHeight) / 2; + let shadows = parse(shadowString); + shadows.forEach(shadow => { + shadow.offsetX /= deltaWidth; + shadow.offsetY /= deltaHeight; + shadow.blurRadius /= scaleAverage; + shadow.spreadRadius /= scaleAverage; + }) + return stringify(shadows); } -export default function mockElement({source, target, offset = {x: 0, y: 0}}){ - if (!source || !target) throw `Can't mock without ${source ? 'target' : 'source'}` ; - let sourceRect = source.getBoundingClientRect(); +export default function mockElement({ source, target, offset = { x: 0, y: 0 } }) { + if (!source || !target) throw `Can't mock without ${source ? 'target' : 'source'}`; + let sourceRect = source.getBoundingClientRect(); let targetRect = target.getBoundingClientRect(); // Get how must the target change to become the source @@ -47,20 +47,20 @@ export default function mockElement({source, target, offset = {x: 0, y: 0}}){ const deltaTop = sourceRect.top - targetRect.top + offset.y; // Mock the source target.style.transform = `translate(${deltaLeft}px, ${deltaTop}px) ` + - `scale(${deltaWidth}, ${deltaHeight})`; + `scale(${deltaWidth}, ${deltaHeight})`; // Mock the background color unless it's completely transparent let backgroundColor = getComputedStyle(source).backgroundColor - if (backgroundColor !== 'rgba(0, 0, 0, 0)'){ + if (backgroundColor !== 'rgba(0, 0, 0, 0)') { target.style.backgroundColor = backgroundColor; } - // Edge might not combine all border radii into a single value, - // So we just sample the top left one if we need to - let oldRadius = getComputedStyle(source).borderRadius || - getComputedStyle(source).borderTopLeftRadius; - let borderRadius = transformedRadius(oldRadius, deltaWidth, deltaHeight); - target.style.borderRadius = borderRadius; - let boxShadow = transformedBoxShadow( - getComputedStyle(source).boxShadow, deltaWidth, deltaHeight - ); - target.style.setProperty('box-shadow', boxShadow, 'important'); + // Edge might not combine all border radii into a single value, + // So we just sample the top left one if we need to + let oldRadius = getComputedStyle(source).borderRadius || + getComputedStyle(source).borderTopLeftRadius; + let borderRadius = transformedRadius(oldRadius, deltaWidth, deltaHeight); + target.style.borderRadius = borderRadius; + let boxShadow = transformedBoxShadow( + getComputedStyle(source).boxShadow, deltaWidth, deltaHeight + ); + target.style.setProperty('box-shadow', boxShadow, 'important'); } diff --git a/app/imports/ui/documentation/FunctionReference.vue b/app/imports/ui/documentation/FunctionReference.vue deleted file mode 100644 index b8172fbd..00000000 --- a/app/imports/ui/documentation/FunctionReference.vue +++ /dev/null @@ -1,49 +0,0 @@ - - - - - diff --git a/app/imports/ui/files/ArchiveFileCard.vue b/app/imports/ui/files/ArchiveFileCard.vue index cab9edde..d8ec1f25 100644 --- a/app/imports/ui/files/ArchiveFileCard.vue +++ b/app/imports/ui/files/ArchiveFileCard.vue @@ -44,17 +44,19 @@ export default { required: true, }, }, - data(){return { - restoreLoading: false, - removeLoading: false, - }}, - meteor: { - characterSlots(){ + data() { + return { + restoreLoading: false, + removeLoading: false, + } + }, + meteor: { + characterSlots() { return characterSlotsRemaining(Meteor.userId()); }, - }, + }, methods: { - restore(){ + restore() { this.restoreLoading = true; restoreCreatureFromFile.call({ fileId: this.model._id, @@ -62,26 +64,26 @@ export default { this.restoreLoading = false; if (!error) return; console.error(error); - snackbar({text: error.reason}); + snackbar({ text: error.reason }); + }); + }, + removeArchiveCharacter() { + let that = this; + this.$store.commit('pushDialogStack', { + component: 'delete-confirmation-dialog', + elementId: `${that.model._id}-archive-card`, + data: { + name: this.model.meta.creatureName, + typeName: 'Character Archive' + }, + callback(confirmation) { + if (!confirmation) return; + removeArchiveCreature.call({ fileId: that.model._id }, (error) => { + if (error) console.error(error); + }); + } }); }, - removeArchiveCharacter(){ - let that = this; - this.$store.commit('pushDialogStack', { - component: 'delete-confirmation-dialog', - elementId: `${that.model._id}-archive-card`, - data: { - name: this.model.meta.creatureName, - typeName: 'Character Archive' - }, - callback(confirmation){ - if(!confirmation) return; - removeArchiveCreature.call({fileId: that.model._id}, (error) => { - if (error) console.error(error); - }); - } - }); - }, }, } diff --git a/app/imports/ui/files/UserImageCard.vue b/app/imports/ui/files/UserImageCard.vue index e70141a6..85c5d155 100644 --- a/app/imports/ui/files/UserImageCard.vue +++ b/app/imports/ui/files/UserImageCard.vue @@ -34,7 +34,6 @@ diff --git a/app/imports/ui/layouts/AppLayout.vue b/app/imports/ui/layouts/AppLayout.vue index 8d958e86..99469969 100644 --- a/app/imports/ui/layouts/AppLayout.vue +++ b/app/imports/ui/layouts/AppLayout.vue @@ -6,9 +6,7 @@ > - + - +
{{ $store.state.pageTitle }}
- +
- +
- +
- + - + diff --git a/app/imports/ui/layouts/Sidebar.vue b/app/imports/ui/layouts/Sidebar.vue index 9c050890..31b5fa60 100644 --- a/app/imports/ui/layouts/Sidebar.vue +++ b/app/imports/ui/layouts/Sidebar.vue @@ -99,6 +99,7 @@ {title: 'Files', icon: 'mdi-file-multiple', to: '/my-files'}, {title: 'Feedback', icon: 'mdi-bug', to: '/feedback'}, {title: 'About', icon: 'mdi-sign-text', to: '/about'}, + {title: 'Documentation', icon: 'mdi-book-open-variant', to: '/docs'}, {title: 'Patreon', icon: 'mdi-patreon', href: 'https://www.patreon.com/dicecloud'}, {title: 'Github', icon: 'mdi-github', href: 'https://github.com/ThaumRystra/DiceCloud/tree/version-2'}, ]; diff --git a/app/imports/ui/library/LibraryCollectionEditDialog.vue b/app/imports/ui/library/LibraryCollectionEditDialog.vue index 8cf2e70c..cccce61a 100644 --- a/app/imports/ui/library/LibraryCollectionEditDialog.vue +++ b/app/imports/ui/library/LibraryCollectionEditDialog.vue @@ -63,62 +63,62 @@ import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js'; import Libraries from '/imports/api/library/Libraries.js'; export default { - components: { - DialogBase, - }, - props: { - _id: String, - }, - methods: { - updateLibraryCollection(update, ack){ - updateLibraryCollection.call({_id: this._id, update}, (error) =>{ - ack(error && error.reason || error); - }); + components: { + DialogBase, + }, + props: { + _id: String, + }, + methods: { + updateLibraryCollection(update, ack) { + updateLibraryCollection.call({ _id: this._id, update }, (error) => { + ack(error && error.reason || error); + }); }, - remove(){ - let that = this; - this.$store.commit('pushDialogStack', { - component: 'delete-confirmation-dialog', - elementId: 'delete-library-button', - data: { - name: this.model.name, - typeName: 'Collection' - }, - callback(confirmation){ - if(!confirmation) return; - removeLibraryCollection.call({_id: that._id}, (error) => { + remove() { + let that = this; + this.$store.commit('pushDialogStack', { + component: 'delete-confirmation-dialog', + elementId: 'delete-library-button', + data: { + name: this.model.name, + typeName: 'Collection' + }, + callback(confirmation) { + if (!confirmation) return; + removeLibraryCollection.call({ _id: that._id }, (error) => { if (error) { console.error(error); snackbar({ text: error.reason, }); - } else { + } else { that.$router.push({ name: 'library', replace: true }); that.$store.dispatch('popDialogStack'); - } - }); - } - }); - }, - share(){ - this.$store.commit('pushDialogStack', { - component: 'share-dialog', - elementId: 'share-library-button', - data: { - docRef: { + } + }); + } + }); + }, + share() { + this.$store.commit('pushDialogStack', { + component: 'share-dialog', + elementId: 'share-library-button', + data: { + docRef: { id: this._id, collection: 'libraryCollections', } - }, - }); - }, - }, - meteor: { - '$subscribe':{ + }, + }); + }, + }, + meteor: { + '$subscribe': { libraries: [], }, - model(){ - return LibraryCollections.findOne(this._id); + model() { + return LibraryCollections.findOne(this._id); }, libraryOptions() { const userId = Meteor.userId(); @@ -131,7 +131,7 @@ export default { { public: true }, ] }, - {sort: {name: 1}} + { sort: { name: 1 } } ).map(library => { return { text: library.name, @@ -139,9 +139,10 @@ export default { }; }); }, - } + } } diff --git a/app/imports/ui/library/LibraryCollectionToolbar.vue b/app/imports/ui/library/LibraryCollectionToolbar.vue index 4147836e..0a128b90 100644 --- a/app/imports/ui/library/LibraryCollectionToolbar.vue +++ b/app/imports/ui/library/LibraryCollectionToolbar.vue @@ -43,24 +43,26 @@ import { assertDocEditPermission } from '/imports/api/sharing/sharingPermissions import { mapMutations } from 'vuex'; export default { - data(){ return { - loading: false, - }}, + data() { + return { + loading: false, + } + }, meteor: { - libraryCollection(){ + libraryCollection() { return LibraryCollections.findOne(this.$route.params.id); }, - subscribed(){ + subscribed() { const libraryCollectionId = this.$route.params.id; const user = Meteor.user(); return user?.subscribedLibraryCollections?.includes(libraryCollectionId); }, - showSubscribeButton(){ + showSubscribeButton() { let user = Meteor.user(); let libraryCollection = this.libraryCollection; if (!user || !libraryCollection) return; let userId = user._id; - if (user.subscribedLibraryCollections?.includes(libraryCollection._id)){ + if (user.subscribedLibraryCollections?.includes(libraryCollection._id)) { return true } else if ( libraryCollection.readers.includes(userId) || @@ -72,7 +74,7 @@ export default { return true; } }, - canEdit(){ + canEdit() { try { assertDocEditPermission(this.libraryCollection, Meteor.userId()); return true @@ -85,7 +87,7 @@ export default { ...mapMutations([ 'toggleDrawer', ]), - subscribe(value){ + subscribe(value) { this.loading = true; Meteor.users.subscribeToLibraryCollection.call({ libraryCollectionId: this.$route.params.id, @@ -94,16 +96,17 @@ export default { this.loading = false; }); }, - editLibraryCollection(){ - this.$store.commit('pushDialogStack', { - component: 'library-collection-edit-dialog', - elementId: 'library-collection-edit-button', - data: {_id: this.$route.params.id}, - }); - }, + editLibraryCollection() { + this.$store.commit('pushDialogStack', { + component: 'library-collection-edit-dialog', + elementId: 'library-collection-edit-button', + data: { _id: this.$route.params.id }, + }); + }, }, } diff --git a/app/imports/ui/library/LibraryContentsContainer.vue b/app/imports/ui/library/LibraryContentsContainer.vue index f30e30fb..1e70fa07 100644 --- a/app/imports/ui/library/LibraryContentsContainer.vue +++ b/app/imports/ui/library/LibraryContentsContainer.vue @@ -1,7 +1,5 @@ - + + diff --git a/app/imports/ui/library/SingleLibraryToolbar.vue b/app/imports/ui/library/SingleLibraryToolbar.vue index fc953903..c3404d8f 100644 --- a/app/imports/ui/library/SingleLibraryToolbar.vue +++ b/app/imports/ui/library/SingleLibraryToolbar.vue @@ -43,24 +43,26 @@ import { assertDocEditPermission } from '/imports/api/sharing/sharingPermissions import { mapMutations } from 'vuex'; export default { - data(){ return { - loading: false, - }}, + data() { + return { + loading: false, + } + }, meteor: { - library(){ + library() { return Libraries.findOne(this.$route.params.id); }, - subscribed(){ + subscribed() { let libraryId = this.$route.params.id; let user = Meteor.user(); return user?.subscribedLibraries?.includes(libraryId); }, - showSubscribeButton(){ + showSubscribeButton() { let user = Meteor.user(); let library = this.library; if (!user || !library) return; let userId = user._id; - if (user.subscribedLibraries.includes(library._id)){ + if (user.subscribedLibraries.includes(library._id)) { return true } else if ( library.readers.includes(userId) || @@ -72,7 +74,7 @@ export default { return true; } }, - canEdit(){ + canEdit() { try { assertDocEditPermission(this.library, Meteor.userId()); return true @@ -85,7 +87,7 @@ export default { ...mapMutations([ 'toggleDrawer', ]), - subscribe(value){ + subscribe(value) { this.loading = true; Meteor.users.subscribeToLibrary.call({ libraryId: this.$route.params.id, @@ -94,16 +96,17 @@ export default { this.loading = false; }); }, - editLibrary(){ - this.$store.commit('pushDialogStack', { - component: 'library-edit-dialog', - elementId: 'library-edit-button', - data: {_id: this.$route.params.id}, - }); - }, + editLibrary() { + this.$store.commit('pushDialogStack', { + component: 'library-edit-dialog', + elementId: 'library-edit-button', + data: { _id: this.$route.params.id }, + }); + }, }, } diff --git a/app/imports/ui/markdownCofig.js b/app/imports/ui/markdownCofig.js index 7fcfeba7..c0ff6a03 100644 --- a/app/imports/ui/markdownCofig.js +++ b/app/imports/ui/markdownCofig.js @@ -8,5 +8,5 @@ marked.setOptions({ silent: true, smartLists: true, smartypants: true, - baseUrl: 'https://dicecloud.com', + //baseUrl: 'https://dicecloud.com', }); diff --git a/app/imports/ui/pages/CharacterSheetPage.vue b/app/imports/ui/pages/CharacterSheetPage.vue index c21908db..a2346e36 100644 --- a/app/imports/ui/pages/CharacterSheetPage.vue +++ b/app/imports/ui/pages/CharacterSheetPage.vue @@ -8,8 +8,8 @@ diff --git a/app/imports/ui/pages/Documentation.vue b/app/imports/ui/pages/Documentation.vue new file mode 100644 index 00000000..c94fe41f --- /dev/null +++ b/app/imports/ui/pages/Documentation.vue @@ -0,0 +1,100 @@ + + + diff --git a/app/imports/ui/pages/FunctionReference.vue b/app/imports/ui/pages/FunctionReference.vue new file mode 100644 index 00000000..c03cf804 --- /dev/null +++ b/app/imports/ui/pages/FunctionReference.vue @@ -0,0 +1,56 @@ + + + diff --git a/app/imports/ui/pages/Home.vue b/app/imports/ui/pages/Home.vue index 171ade01..72642172 100644 --- a/app/imports/ui/pages/Home.vue +++ b/app/imports/ui/pages/Home.vue @@ -132,17 +132,17 @@ diff --git a/app/imports/ui/pages/SignIn.vue b/app/imports/ui/pages/SignIn.vue index 87f83356..a1a0ba2e 100644 --- a/app/imports/ui/pages/SignIn.vue +++ b/app/imports/ui/pages/SignIn.vue @@ -91,53 +91,53 @@ diff --git a/app/imports/ui/pages/SingleLibrary.vue b/app/imports/ui/pages/SingleLibrary.vue index d564dee1..4faa0452 100644 --- a/app/imports/ui/pages/SingleLibrary.vue +++ b/app/imports/ui/pages/SingleLibrary.vue @@ -7,12 +7,29 @@ diff --git a/app/imports/ui/pages/Tabletops.vue b/app/imports/ui/pages/Tabletops.vue index fca7d1c6..5417feb4 100644 --- a/app/imports/ui/pages/Tabletops.vue +++ b/app/imports/ui/pages/Tabletops.vue @@ -37,7 +37,7 @@ import SingleCardLayout from '/imports/ui/layouts/SingleCardLayout.vue' import Tabletops from '/imports/api/tabletop/Tabletops.js'; import insertTabletop from '/imports/api/tabletop/methods/insertTabletop.js'; -import snackbar from '/imports/ui/components/snackbars/SnackbarQueue.js'; +import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js'; export default { components: { diff --git a/app/imports/ui/properties/components/actions/ActionCard.vue b/app/imports/ui/properties/components/actions/ActionCard.vue index 50f22c18..040009c9 100644 --- a/app/imports/ui/properties/components/actions/ActionCard.vue +++ b/app/imports/ui/properties/components/actions/ActionCard.vue @@ -38,9 +38,7 @@ :disabled="model.insufficientResources || !context.editPermission" @click.stop="doAction" > - +
-
+
{{ model.name || propertyName }}
@@ -89,16 +85,13 @@ /> - - +
@@ -115,9 +108,12 @@ import ItemConsumedView from '/imports/ui/properties/components/actions/ItemCons import PropertyIcon from '/imports/ui/properties/shared/PropertyIcon.vue'; import RollPopup from '/imports/ui/components/RollPopup.vue'; import MarkdownText from '/imports/ui/components/MarkdownText.vue'; -import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js'; +import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js'; import CardHighlight from '/imports/ui/components/CardHighlight.vue'; -import CreaturePropertiesTree from '/imports/ui/creature/creatureProperties/CreaturePropertiesTree.vue'; +import TreeNodeList from '/imports/ui/components/tree/TreeNodeList.vue'; +import { nodeArrayToTree } from '/imports/api/parenting/nodesToTree.js'; +import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js'; +import { some } from 'lodash'; export default { components: { @@ -127,7 +123,7 @@ export default { PropertyIcon, RollPopup, CardHighlight, - CreaturePropertiesTree, + TreeNodeList, }, inject: { context: { @@ -145,20 +141,22 @@ export default { required: true, }, }, - data(){return { - activated: undefined, - doActionLoading: false, - hovering: false, - }}, + data() { + return { + activated: undefined, + doActionLoading: false, + hovering: false, + } + }, computed: { - rollBonus(){ + rollBonus() { if (!this.model.attackRoll) return; return numberToSignedString(this.model.attackRoll.value); }, - rollBonusTooLong(){ + rollBonusTooLong() { return this.rollBonus && this.rollBonus.length > 3; }, - propertyName(){ + propertyName() { return getPropertyName(this.model.type); }, cardClasses() { @@ -173,12 +171,41 @@ export default { actionTypeIcon() { return `$vuetify.icons.${this.model.actionType}`; }, - }, + }, + meteor: { + children() { + const indicesOfTerminatingProps = []; + const decendants = CreatureProperties.find({ + 'ancestors.id': this.model._id, + 'removed': { $ne: true }, + }, { + sort: {order: 1} + }).map(prop => { + // Get all the props we don't want to show the decendants of and + // where they might appear in the ancestor list + if (prop.type === 'buff' || prop.type === 'folder') { + indicesOfTerminatingProps.push({ + id: prop._id, + ancestorIndex: prop.ancestors.length, + }); + } + return prop; + }).filter(prop => { + // Filter out folders entirely + if (prop.type === 'folder') return false; + // Filter out decendants of terminating props + return !some(indicesOfTerminatingProps, buffIndex => { + return prop.ancestors[buffIndex.ancestorIndex]?.id === buffIndex.id; + }); + }); + return nodeArrayToTree(decendants); + }, + }, methods: { - click(e){ - this.$emit('click', e); - }, - doAction({advantage}){ + click(e) { + this.$emit('click', e); + }, + doAction({ advantage }) { this.doActionLoading = true; this.shwing(); doAction.call({ @@ -188,13 +215,13 @@ export default { } }, error => { this.doActionLoading = false; - if (error){ + if (error) { console.error(error); - snackbar({text: error.reason}); + snackbar({ text: error.reason }); } }); }, - shwing(){ + shwing() { this.activated = true; setTimeout(() => { this.activated = undefined; @@ -209,9 +236,11 @@ export default { transition: box-shadow .4s cubic-bezier(0.25, 0.8, 0.25, 1), transform 0.075s ease; } + .action-card.active { transform: scale(0.92); } + .action-title { font-size: 16px; font-weight: 400; @@ -222,9 +251,10 @@ export default { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; - transition: .3s cubic-bezier(.25,.8,.5,1); + transition: .3s cubic-bezier(.25, .8, .5, 1); width: 100%; } + .action-sub-title { color: #9e9e9e; flex-grow: 0; @@ -236,15 +266,19 @@ export default { text-overflow: ellipsis; width: 100%; } + .action-child { height: 32px; } + .theme--light.muted-text { - color: rgba(0,0,0,.3) !important; + color: rgba(0, 0, 0, .3) !important; } + .theme--dark.muted-text { - color: hsla(0,0%,100%,.3) !important; + color: hsla(0, 0%, 100%, .3) !important; } + .action-card { transition: transform 0.15s cubic; } @@ -252,12 +286,14 @@ export default { diff --git a/app/imports/ui/properties/components/attributes/AbilityListTile.vue b/app/imports/ui/properties/components/attributes/AbilityListTile.vue index c4d748da..46d36bb8 100644 --- a/app/imports/ui/properties/components/attributes/AbilityListTile.vue +++ b/app/imports/ui/properties/components/attributes/AbilityListTile.vue @@ -55,7 +55,7 @@ import numberToSignedString from '/imports/ui/utility/numberToSignedString.js'; import RollPopup from '/imports/ui/components/RollPopup.vue'; import doCheck from '/imports/api/engine/actions/doCheck.js'; -import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js'; +import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js'; export default { components: { @@ -66,23 +66,25 @@ export default { default: {}, }, }, - props: { - model: {type: Object, required: true}, - }, - data(){return { - checkLoading: false, - }}, - computed: { - hasClickListener(){ + props: { + model: { type: Object, required: true }, + }, + data() { + return { + checkLoading: false, + } + }, + computed: { + hasClickListener() { return this.$listeners && this.$listeners.click - }, - }, - methods: { - numberToSignedString, - click(e){ - this.$emit('click', e); - }, - check({advantage}){ + }, + }, + methods: { + numberToSignedString, + click(e) { + this.$emit('click', e); + }, + check({ advantage }) { this.checkLoading = true; doCheck.call({ propId: this.model._id, @@ -91,15 +93,15 @@ export default { }, }, error => { this.checkLoading = false; - if (error){ + if (error) { console.error(error); - snackbar({text: error.reason}); + snackbar({ text: error.reason }); } }); }, - }, + }, meteor: { - swapScoresAndMods(){ + swapScoresAndMods() { let user = Meteor.user(); return user && user.preferences && @@ -110,26 +112,32 @@ export default { diff --git a/app/imports/ui/properties/components/attributes/AttributeEffect.vue b/app/imports/ui/properties/components/attributes/AttributeEffect.vue index 687500bc..5725a3ef 100644 --- a/app/imports/ui/properties/components/attributes/AttributeEffect.vue +++ b/app/imports/ui/properties/components/attributes/AttributeEffect.vue @@ -27,9 +27,9 @@
{{ displayedText }}
-
+
diff --git a/app/imports/ui/properties/components/attributes/HealthBarCard.vue b/app/imports/ui/properties/components/attributes/HealthBarCard.vue index f05c7978..c3409ee0 100644 --- a/app/imports/ui/properties/components/attributes/HealthBarCard.vue +++ b/app/imports/ui/properties/components/attributes/HealthBarCard.vue @@ -17,17 +17,17 @@ diff --git a/app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue b/app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue index 9b8440e7..639beee0 100644 --- a/app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue +++ b/app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue @@ -12,60 +12,60 @@ diff --git a/app/imports/ui/properties/components/attributes/HitDiceListTile.vue b/app/imports/ui/properties/components/attributes/HitDiceListTile.vue index e26f1abd..7cfff667 100644 --- a/app/imports/ui/properties/components/attributes/HitDiceListTile.vue +++ b/app/imports/ui/properties/components/attributes/HitDiceListTile.vue @@ -31,9 +31,7 @@ - +
{{ model.value }}
@@ -63,60 +61,71 @@ export default { inject: { context: { default: {} } }, - props: { + props: { model: { type: Object, required: true, } - }, - data(){ return{ - hover: false, - }}, + }, + data() { + return { + hover: false, + } + }, computed: { - signedConMod(){ + signedConMod() { return numberToSignedString(this.model.constitutionMod); }, }, - methods: { - click(e){ - this.$emit('click', e); - }, - increment(value){ - this.$emit('change', {type: 'increment', value}) - }, - }, + methods: { + click(e) { + this.$emit('click', e); + }, + increment(value) { + this.$emit('change', { type: 'increment', value }) + }, + }, }; diff --git a/app/imports/ui/properties/components/attributes/ResourceCard.vue b/app/imports/ui/properties/components/attributes/ResourceCard.vue index 44390756..c5759892 100644 --- a/app/imports/ui/properties/components/attributes/ResourceCard.vue +++ b/app/imports/ui/properties/components/attributes/ResourceCard.vue @@ -22,9 +22,7 @@ mdi-chevron-down
-
+
{{ model.value }}
@@ -53,55 +51,64 @@ diff --git a/app/imports/ui/properties/components/attributes/SpellSlotListTile.vue b/app/imports/ui/properties/components/attributes/SpellSlotListTile.vue index 02afc030..584fc765 100644 --- a/app/imports/ui/properties/components/attributes/SpellSlotListTile.vue +++ b/app/imports/ui/properties/components/attributes/SpellSlotListTile.vue @@ -7,9 +7,7 @@ v-on="hasClickListener ? {click} : {}" > - +
import numberToSignedString from '/imports/ui/utility/numberToSignedString.js'; export default { - props: { - model: { + props: { + model: { type: Object, required: true, }, dark: Boolean, hideCastButton: Boolean, disabled: Boolean, - }, - computed: { - hasClickListener(){ + }, + computed: { + hasClickListener() { return this.$listeners && !!this.$listeners.click; }, - }, - methods: { - signed: numberToSignedString, - click(e){ - this.$emit('click', e); - }, - }, + }, + methods: { + signed: numberToSignedString, + click(e) { + this.$emit('click', e); + }, + }, }; diff --git a/app/imports/ui/properties/components/features/FeatureCard.vue b/app/imports/ui/properties/components/features/FeatureCard.vue index 0f706b3e..860e11de 100644 --- a/app/imports/ui/properties/components/features/FeatureCard.vue +++ b/app/imports/ui/properties/components/features/FeatureCard.vue @@ -10,7 +10,7 @@ - + diff --git a/app/imports/ui/properties/components/inventory/ItemList.vue b/app/imports/ui/properties/components/inventory/ItemList.vue index 6696ee12..28a07995 100644 --- a/app/imports/ui/properties/components/inventory/ItemList.vue +++ b/app/imports/ui/properties/components/inventory/ItemList.vue @@ -52,40 +52,42 @@ export default { preparingSpells: Boolean, equipment: Boolean, }, - data(){ return { - dataItems: [], - }}, + data() { + return { + dataItems: [], + } + }, computed: { - levels(){ + levels() { let levels = new Set(); this.items.forEach(item => levels.add(item.level)); return levels; }, }, watch: { - items(value){ + items(value) { this.dataItems = value; } }, - mounted(){ + mounted() { this.dataItems = this.items; }, methods: { - clickProperty(_id){ - this.$store.commit('pushDialogStack', { - component: 'creature-property-dialog', - elementId: _id, - data: {_id}, - }); - }, - change({added, moved}){ + clickProperty(_id) { + this.$store.commit('pushDialogStack', { + component: 'creature-property-dialog', + elementId: _id, + data: { _id }, + }); + }, + change({ added, moved }) { let event = added || moved; - if (event){ + if (event) { // If this item is now adjacent to another, set the order accordingly let order; let before = this.dataItems[event.newIndex - 1]; let after = this.dataItems[event.newIndex + 1]; - if (before && before._id){ + if (before && before._id) { order = before.order + 0.5; } else if (after && after._id) { order = after.order - 0.5; @@ -101,7 +103,7 @@ export default { parentRef: this.parentRef, order, }); - if (doc.type === 'item' && doc.equipped != this.equipment){ + if (doc.type === 'item' && doc.equipped != this.equipment) { updateCreatureProperty.call({ _id: doc._id, path: ['equipped'], @@ -111,6 +113,6 @@ export default { } setTimeout(() => this.dataItems = this.items, 0); }, - } + } } diff --git a/app/imports/ui/properties/components/inventory/ItemListTile.vue b/app/imports/ui/properties/components/inventory/ItemListTile.vue index d6e64249..5dfa1b8e 100644 --- a/app/imports/ui/properties/components/inventory/ItemListTile.vue +++ b/app/imports/ui/properties/components/inventory/ItemListTile.vue @@ -49,10 +49,10 @@ import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeView import PROPERTIES from '/imports/constants/PROPERTIES.js'; import adjustQuantity from '/imports/api/creature/creatureProperties/methods/adjustQuantity.js'; import IncrementButton from '/imports/ui/components/IncrementButton.vue'; -import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js'; +import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js'; export default { - components:{ + components: { IncrementButton, }, mixins: [treeNodeViewMixin], @@ -62,20 +62,22 @@ export default { props: { preparingSpells: Boolean, }, - data(){return { - incrementLoading: false, - }}, + data() { + return { + incrementLoading: false, + } + }, computed: { - hasClickListener(){ + hasClickListener() { return this.$listeners && !!this.$listeners.click; }, - title(){ + title() { let model = this.model; if (!model) return; - if (model.quantity !== 1){ - if (model.plural){ + if (model.quantity !== 1) { + if (model.plural) { return `${model.quantity} ${model.plural}`; - } else if (model.name){ + } else if (model.name) { return `${model.quantity} ${model.name}`; } } else if (model.name) { @@ -86,10 +88,10 @@ export default { } }, methods: { - click(e){ - this.$emit('click', e); - }, - changeQuantity({type, value}) { + click(e) { + this.$emit('click', e); + }, + changeQuantity({ type, value }) { this.incrementLoading = true; adjustQuantity.call({ _id: this.model._id, @@ -97,8 +99,8 @@ export default { value: value }, error => { this.incrementLoading = false; - if (error){ - snackbar({text: error.reason}); + if (error) { + snackbar({ text: error.reason }); console.error(error); } }); @@ -111,6 +113,7 @@ export default { .item-avatar { min-width: 32px; } + .item { background-color: inherit; } diff --git a/app/imports/ui/properties/components/persona/NoteCard.vue b/app/imports/ui/properties/components/persona/NoteCard.vue index f3be2a0e..d07afa1e 100644 --- a/app/imports/ui/properties/components/persona/NoteCard.vue +++ b/app/imports/ui/properties/components/persona/NoteCard.vue @@ -31,10 +31,10 @@ import isDarkColor from '/imports/ui/utility/isDarkColor.js'; import CardHighlight from '/imports/ui/components/CardHighlight.vue'; export default { - components: { - PropertyDescription, + components: { + PropertyDescription, CardHighlight, - }, + }, inject: { theme: { default: { @@ -42,31 +42,34 @@ export default { }, }, }, - props: { - model: { + props: { + model: { type: Object, required: true, }, - }, - data(){ return{ - hover: false, - }}, + }, + data() { + return { + hover: false, + } + }, computed: { - isDark(){ + isDark() { return isDarkColor(this.model.color); }, }, - methods: { - clickProperty(_id){ - this.$store.commit('pushDialogStack', { - component: 'creature-property-dialog', - elementId: `${_id}`, - data: {_id}, - }); - }, - }, + methods: { + clickProperty(_id) { + this.$store.commit('pushDialogStack', { + component: 'creature-property-dialog', + elementId: `${_id}`, + data: { _id }, + }); + }, + }, }; diff --git a/app/imports/ui/properties/components/pointBuy/PointBuyCard.vue b/app/imports/ui/properties/components/pointBuy/PointBuyCard.vue new file mode 100644 index 00000000..cbd3f339 --- /dev/null +++ b/app/imports/ui/properties/components/pointBuy/PointBuyCard.vue @@ -0,0 +1,72 @@ + + + diff --git a/app/imports/ui/properties/components/skills/SkillListTile.vue b/app/imports/ui/properties/components/skills/SkillListTile.vue index 45f8b138..bbcb773e 100644 --- a/app/imports/ui/properties/components/skills/SkillListTile.vue +++ b/app/imports/ui/properties/components/skills/SkillListTile.vue @@ -8,7 +8,7 @@ -
+
{{ model.name }} diff --git a/app/imports/ui/properties/forms/PointBuyForm.vue b/app/imports/ui/properties/forms/PointBuyForm.vue new file mode 100644 index 00000000..41426acb --- /dev/null +++ b/app/imports/ui/properties/forms/PointBuyForm.vue @@ -0,0 +1,219 @@ + + + diff --git a/app/imports/ui/properties/forms/PointBuySpendForm.vue b/app/imports/ui/properties/forms/PointBuySpendForm.vue new file mode 100644 index 00000000..403cd927 --- /dev/null +++ b/app/imports/ui/properties/forms/PointBuySpendForm.vue @@ -0,0 +1,108 @@ + + + diff --git a/app/imports/ui/properties/forms/ProficiencyForm.vue b/app/imports/ui/properties/forms/ProficiencyForm.vue index 87b35b4a..4fcf2825 100644 --- a/app/imports/ui/properties/forms/ProficiencyForm.vue +++ b/app/imports/ui/properties/forms/ProficiencyForm.vue @@ -48,17 +48,18 @@ diff --git a/app/imports/ui/properties/forms/ResourcesForm.vue b/app/imports/ui/properties/forms/ResourcesForm.vue index 5c3e92d9..e3fc0dcb 100644 --- a/app/imports/ui/properties/forms/ResourcesForm.vue +++ b/app/imports/ui/properties/forms/ResourcesForm.vue @@ -55,54 +55,57 @@ diff --git a/app/imports/ui/properties/forms/RollForm.vue b/app/imports/ui/properties/forms/RollForm.vue index 26432790..c06ceaa6 100644 --- a/app/imports/ui/properties/forms/RollForm.vue +++ b/app/imports/ui/properties/forms/RollForm.vue @@ -41,7 +41,7 @@ > - + diff --git a/app/imports/ui/properties/forms/SavingThrowForm.vue b/app/imports/ui/properties/forms/SavingThrowForm.vue index a9da6172..8e0c5540 100644 --- a/app/imports/ui/properties/forms/SavingThrowForm.vue +++ b/app/imports/ui/properties/forms/SavingThrowForm.vue @@ -65,6 +65,12 @@ :error-messages="errors.tags" @change="change('tags', ...arguments)" /> + diff --git a/app/imports/ui/properties/forms/SkillForm.vue b/app/imports/ui/properties/forms/SkillForm.vue index 2854013e..91d30970 100644 --- a/app/imports/ui/properties/forms/SkillForm.vue +++ b/app/imports/ui/properties/forms/SkillForm.vue @@ -53,9 +53,7 @@ - + diff --git a/app/imports/ui/properties/forms/SlotFillerForm.vue b/app/imports/ui/properties/forms/SlotFillerForm.vue index 64ce1c51..28890a30 100644 --- a/app/imports/ui/properties/forms/SlotFillerForm.vue +++ b/app/imports/ui/properties/forms/SlotFillerForm.vue @@ -95,20 +95,20 @@ diff --git a/app/imports/ui/properties/forms/SlotForm.vue b/app/imports/ui/properties/forms/SlotForm.vue index 6c001c2c..f2dc7c9b 100644 --- a/app/imports/ui/properties/forms/SlotForm.vue +++ b/app/imports/ui/properties/forms/SlotForm.vue @@ -72,13 +72,11 @@ @change="change('slotTags', ...arguments)" /> - +
- +
diff --git a/app/imports/ui/properties/forms/SpellForm.vue b/app/imports/ui/properties/forms/SpellForm.vue index db36d5b0..4544857c 100644 --- a/app/imports/ui/properties/forms/SpellForm.vue +++ b/app/imports/ui/properties/forms/SpellForm.vue @@ -247,9 +247,7 @@ /> - + diff --git a/app/imports/ui/properties/forms/ToggleForm.vue b/app/imports/ui/properties/forms/ToggleForm.vue index f3d01b0f..5f98729c 100644 --- a/app/imports/ui/properties/forms/ToggleForm.vue +++ b/app/imports/ui/properties/forms/ToggleForm.vue @@ -41,9 +41,7 @@ cols="12" md="6" > - + - + diff --git a/app/imports/ui/properties/forms/TriggerForm.vue b/app/imports/ui/properties/forms/TriggerForm.vue index 2a8e3d8a..d48932a7 100644 --- a/app/imports/ui/properties/forms/TriggerForm.vue +++ b/app/imports/ui/properties/forms/TriggerForm.vue @@ -140,6 +140,12 @@ :value="model.tags" @change="change('tags', ...arguments)" /> +
diff --git a/app/imports/ui/properties/forms/shared/CalculationErrorList.vue b/app/imports/ui/properties/forms/shared/CalculationErrorList.vue index 93b2df2d..a3f7d152 100644 --- a/app/imports/ui/properties/forms/shared/CalculationErrorList.vue +++ b/app/imports/ui/properties/forms/shared/CalculationErrorList.vue @@ -73,5 +73,8 @@ export default { } - diff --git a/app/imports/ui/properties/forms/shared/ComputedField.vue b/app/imports/ui/properties/forms/shared/ComputedField.vue index d6b237e4..9d3ac194 100644 --- a/app/imports/ui/properties/forms/shared/ComputedField.vue +++ b/app/imports/ui/properties/forms/shared/ComputedField.vue @@ -6,7 +6,7 @@ @change="(value, ack) => $emit('change', {path: ['calculation'], value, ack})" > diff --git a/app/imports/ui/properties/forms/shared/ProficiencySelect.vue b/app/imports/ui/properties/forms/shared/ProficiencySelect.vue index 51e1dc4c..1af7095a 100644 --- a/app/imports/ui/properties/forms/shared/ProficiencySelect.vue +++ b/app/imports/ui/properties/forms/shared/ProficiencySelect.vue @@ -22,11 +22,11 @@ diff --git a/app/imports/ui/properties/forms/shared/propertyFormIndex.js b/app/imports/ui/properties/forms/shared/propertyFormIndex.js index e8d6eb9f..bd6c6ba9 100644 --- a/app/imports/ui/properties/forms/shared/propertyFormIndex.js +++ b/app/imports/ui/properties/forms/shared/propertyFormIndex.js @@ -15,6 +15,7 @@ const FeatureForm = () => import('/imports/ui/properties/forms/FeatureForm.vue') const FolderForm = () => import('/imports/ui/properties/forms/FolderForm.vue'); const ItemForm = () => import('/imports/ui/properties/forms/ItemForm.vue'); const NoteForm = () => import('/imports/ui/properties/forms/NoteForm.vue'); +const PointBuyForm = () => import('/imports/ui/properties/forms/PointBuyForm.vue'); const ProficiencyForm = () => import('/imports/ui/properties/forms/ProficiencyForm.vue'); const ReferenceForm = () => import('/imports/ui/properties/forms/ReferenceForm.vue'); const RollForm = () => import('/imports/ui/properties/forms/RollForm.vue'); @@ -45,6 +46,7 @@ export default { folder: FolderForm, item: ItemForm, note: NoteForm, + pointBuy: PointBuyForm, proficiency: ProficiencyForm, propertySlot: SlotForm, reference: ReferenceForm, diff --git a/app/imports/ui/properties/forms/shared/schemaFormMixin.js b/app/imports/ui/properties/forms/shared/schemaFormMixin.js index e1d3a349..5db234da 100644 --- a/app/imports/ui/properties/forms/shared/schemaFormMixin.js +++ b/app/imports/ui/properties/forms/shared/schemaFormMixin.js @@ -4,9 +4,9 @@ */ import { get, toPath } from 'lodash'; -function resolvePath(model, path, set){ +function resolvePath(model, path, set) { let arrayPath = toPath(path); - if (arrayPath.length === 1){ + if (arrayPath.length === 1) { return { object: model, key: arrayPath[0] }; } let key = arrayPath.slice(-1); @@ -15,67 +15,69 @@ function resolvePath(model, path, set){ // Ensure that nested objects exist before navigating them objectPath.forEach(pathKey => { let newObject = object[pathKey]; - if (!newObject){ + if (!newObject) { newObject = {}; set(object, pathKey, newObject); } object = newObject; }); - return {object, key}; + return { object, key }; } const schemaFormMixin = { - data(){ return { - valid: true, - };}, - computed: { - errors(){ - this.valid = true; - if (!this.model){ - throw new Error('this.model must be set'); - } - if (!this.validationContext) return {}; - let cleanModel = this.validationContext.clean(this.model, { - getAutoValues: false, - }); - this.validationContext.validate(cleanModel); - let errors = {}; - this.validationContext.validationErrors().forEach(error => { - if (this.valid) this.valid = false; - errors[error.name] = this.schema.messageForError(error); - }); - return errors; - }, - }, - methods: { + data() { + return { + valid: true, + }; + }, + computed: { + errors() { + this.valid = true; + if (!this.model) { + throw new Error('this.model must be set'); + } + if (!this.validationContext) return {}; + let cleanModel = this.validationContext.clean(this.model, { + getAutoValues: false, + }); + this.validationContext.validate(cleanModel); + let errors = {}; + this.validationContext.validationErrors().forEach(error => { + if (this.valid) this.valid = false; + errors[error.name] = this.schema.messageForError(error); + }); + return errors; + }, + }, + methods: { // Sets the value at the given path - change({path, value, ack}){ - let {object, key} = resolvePath(this.model, path, this.$set); + change({ path, value, ack }) { + let { object, key } = resolvePath(this.model, path, this.$set); - this.$set(object, key, value); - if (ack) ack(); - }, - push({path, value, ack}){ + this.$set(object, key, value); + if (ack) ack(); + }, + push({ path, value, ack }) { let array = get(this.model, path); - if (array === undefined){ - let {object, key} = resolvePath(this.model, path, this.$set); + if (array === undefined) { + let { object, key } = resolvePath(this.model, path, this.$set); this.$set(object, key, [value]); - } else if (!array.push){ + } else if (!array.push) { throw `${path.join('.')} is ${array}, doesn't have "push"` } else { array.push(value); } - if (ack) ack(); + if (ack) ack(); }, - pull({path, ack}){ - let {object, key} = resolvePath(this.model, path, this.$set); - if (!object || !object.splice){ + pull({ path, ack }) { + let { object, key } = resolvePath(this.model, path, this.$set); + if (!object || !object.splice) { throw `${path.join('.')} is ${object}, doesnt have "splice"` } object.splice(key, 1); if (ack) ack(); }, - }, + }, }; export default schemaFormMixin; diff --git a/app/imports/ui/properties/shared/ProficiencyIcon.vue b/app/imports/ui/properties/shared/ProficiencyIcon.vue index 91249fc3..223ef725 100644 --- a/app/imports/ui/properties/shared/ProficiencyIcon.vue +++ b/app/imports/ui/properties/shared/ProficiencyIcon.vue @@ -8,16 +8,16 @@ import getProficiencyIcon from '/imports/ui/utility/getProficiencyIcon.js'; export default { - props: { - value: { + props: { + value: { type: Number, default: undefined, }, - }, - computed: { - displayedIcon(){ + }, + computed: { + displayedIcon(){ return getProficiencyIcon(this.value); - } - } + } + } } diff --git a/app/imports/ui/properties/shared/PropertyIcon.vue b/app/imports/ui/properties/shared/PropertyIcon.vue index bf173aef..73a241db 100644 --- a/app/imports/ui/properties/shared/PropertyIcon.vue +++ b/app/imports/ui/properties/shared/PropertyIcon.vue @@ -18,8 +18,8 @@ import { getPropertyIcon } from '/imports/constants/PROPERTIES.js'; export default { - props: { - model: { + props: { + model: { type: Object, default: () => ({}), }, @@ -28,17 +28,18 @@ export default { default: undefined, }, disabled: Boolean, - }, - computed: { - icon(){ - return getPropertyIcon(this.model && this.model.type); - }, - }, + }, + computed: { + icon() { + return getPropertyIcon(this.model && this.model.type); + }, + }, } diff --git a/app/imports/ui/properties/shared/PropertySelector.vue b/app/imports/ui/properties/shared/PropertySelector.vue index 36670fe7..8fc32b7e 100644 --- a/app/imports/ui/properties/shared/PropertySelector.vue +++ b/app/imports/ui/properties/shared/PropertySelector.vue @@ -1,8 +1,6 @@ diff --git a/app/imports/ui/properties/viewers/EffectViewer.vue b/app/imports/ui/properties/viewers/EffectViewer.vue index ef72d816..5880fc10 100644 --- a/app/imports/ui/properties/viewers/EffectViewer.vue +++ b/app/imports/ui/properties/viewers/EffectViewer.vue @@ -6,9 +6,7 @@ class="layout" style="overflow: hidden;" > - + {{ effectIcon }} {{ operation }} @@ -77,71 +75,75 @@ diff --git a/app/imports/ui/properties/viewers/FeatureViewer.vue b/app/imports/ui/properties/viewers/FeatureViewer.vue index 4727df07..ae5c405b 100644 --- a/app/imports/ui/properties/viewers/FeatureViewer.vue +++ b/app/imports/ui/properties/viewers/FeatureViewer.vue @@ -16,9 +16,10 @@ diff --git a/app/imports/ui/properties/viewers/FolderViewer.vue b/app/imports/ui/properties/viewers/FolderViewer.vue index 352db109..51a51a76 100644 --- a/app/imports/ui/properties/viewers/FolderViewer.vue +++ b/app/imports/ui/properties/viewers/FolderViewer.vue @@ -5,9 +5,10 @@ diff --git a/app/imports/ui/properties/viewers/ItemViewer.vue b/app/imports/ui/properties/viewers/ItemViewer.vue index d5f07aab..0db65ce7 100644 --- a/app/imports/ui/properties/viewers/ItemViewer.vue +++ b/app/imports/ui/properties/viewers/ItemViewer.vue @@ -24,9 +24,7 @@ v-if="model.value !== undefined" name="value" > -
+
- + -
+
- + Equipped - + diff --git a/app/imports/ui/properties/viewers/RollViewer.vue b/app/imports/ui/properties/viewers/RollViewer.vue index d00aeed1..31e87bbf 100644 --- a/app/imports/ui/properties/viewers/RollViewer.vue +++ b/app/imports/ui/properties/viewers/RollViewer.vue @@ -17,9 +17,9 @@ diff --git a/app/imports/ui/properties/viewers/SavingThrowViewer.vue b/app/imports/ui/properties/viewers/SavingThrowViewer.vue index 02b4fbcb..59feea7a 100644 --- a/app/imports/ui/properties/viewers/SavingThrowViewer.vue +++ b/app/imports/ui/properties/viewers/SavingThrowViewer.vue @@ -22,9 +22,9 @@ diff --git a/app/imports/ui/properties/viewers/SkillViewer.vue b/app/imports/ui/properties/viewers/SkillViewer.vue index 5cc7479e..db6609c5 100644 --- a/app/imports/ui/properties/viewers/SkillViewer.vue +++ b/app/imports/ui/properties/viewers/SkillViewer.vue @@ -47,6 +47,12 @@ name="Passive score" :value="passiveScore" /> + - ({ - _id: prop._id, - name: 'Skill base value', - operation: 'base', - calculation: prop.baseValueCalculation, - amount: {value: prop.baseValue?.value}, - stats: [prop.variableName], - ancestors: prop.ancestors, - }) ).filter(effect => effect.amount?.value); - } else { - return []; - } - }, - effects() { - return CreatureProperties.find({ - _id: { $in: this.model.effects?.map(e => e._id) || [] } - }); - }, - baseProficiencies(){ - if (this.context.creatureId){ - let creatureId = this.context.creatureId; - return CreatureProperties.find({ - 'ancestors.id': creatureId, - type: 'skill', - variableName: this.model.variableName, - removed: {$ne: true}, - inactive: {$ne: true}, - }).map( prop => ({ + removed: { $ne: true }, + inactive: { $ne: true }, + }).map(prop => ({ _id: prop._id, name: 'Skill base proficiency', value: prop.baseProficiency, stats: [prop.variableName], ancestors: prop.ancestors, - }) ).filter(prof => prof.value); + })).filter(prof => prof.value); } else { return []; } }, - proficiencies(){ + proficiencies() { let creatureId = this.context.creatureId; - if (creatureId){ + if (creatureId) { return CreatureProperties.find({ 'ancestors.id': creatureId, stats: this.model.variableName, type: 'proficiency', - removed: {$ne: true}, - inactive: {$ne: true}, + removed: { $ne: true }, + inactive: { $ne: true }, }).fetch(); } else { return []; } }, - ability(){ + ability() { let creatureId = this.context.creatureId; let ability = this.model.ability; if (!creatureId || !ability) return; @@ -257,21 +234,21 @@ export default { 'ancestors.id': creatureId, variableName: ability, type: 'attribute', - removed: {$ne: true}, - inactive: {$ne: true}, - overridden: {$ne: true}, + removed: { $ne: true }, + inactive: { $ne: true }, + overridden: { $ne: true }, }); if (!abilityProp) return; return { _id: abilityProp._id, name: abilityProp.name, - operation: 'base', - amount: {value: abilityProp.modifier}, + operation: 'add', + amount: { value: abilityProp.modifier }, stats: [this.model.variableName], ancestors: abilityProp.ancestors, } }, - proficiencyBonus(){ + proficiencyBonus() { let creatureId = this.context.creatureId; if (!creatureId) return; return this.variables.proficiencyBonus && @@ -282,4 +259,5 @@ export default { diff --git a/app/imports/ui/properties/viewers/SlotFillerViewer.vue b/app/imports/ui/properties/viewers/SlotFillerViewer.vue index 6ebf8a36..d3cb60c5 100644 --- a/app/imports/ui/properties/viewers/SlotFillerViewer.vue +++ b/app/imports/ui/properties/viewers/SlotFillerViewer.vue @@ -32,32 +32,30 @@ name="Description" :cols="{cols: 12}" > - +
diff --git a/app/imports/ui/properties/viewers/SlotViewer.vue b/app/imports/ui/properties/viewers/SlotViewer.vue index 36e432f1..55ceeb8d 100644 --- a/app/imports/ui/properties/viewers/SlotViewer.vue +++ b/app/imports/ui/properties/viewers/SlotViewer.vue @@ -60,34 +60,34 @@ diff --git a/app/imports/ui/properties/viewers/SpellListViewer.vue b/app/imports/ui/properties/viewers/SpellListViewer.vue index 9b4c9d49..f7c35b57 100644 --- a/app/imports/ui/properties/viewers/SpellListViewer.vue +++ b/app/imports/ui/properties/viewers/SpellListViewer.vue @@ -37,6 +37,6 @@ diff --git a/app/imports/ui/properties/viewers/SpellViewer.vue b/app/imports/ui/properties/viewers/SpellViewer.vue index 35b31e7b..ee8085b2 100644 --- a/app/imports/ui/properties/viewers/SpellViewer.vue +++ b/app/imports/ui/properties/viewers/SpellViewer.vue @@ -43,12 +43,12 @@ export default { components: { ActionViewer, }, - mixins: [propertyViewerMixin], - computed:{ - levelText(){ + mixins: [propertyViewerMixin], + computed: { + levelText() { return levelText[this.model.level] }, - spellComponents(){ + spellComponents() { let components = []; if (this.model.ritual) components.push('Ritual'); if (this.model.concentration) components.push('Concentration'); @@ -62,4 +62,5 @@ export default { diff --git a/app/imports/ui/properties/viewers/ToggleViewer.vue b/app/imports/ui/properties/viewers/ToggleViewer.vue index 666c184f..f2b9037a 100644 --- a/app/imports/ui/properties/viewers/ToggleViewer.vue +++ b/app/imports/ui/properties/viewers/ToggleViewer.vue @@ -11,9 +11,7 @@ name="Status" :value="model.enabled ? 'Enabled' : 'Disabled'" /> -