Update Meteor to 1.2

This requires local copies of packages that are broken or not Polymer 0.5
2015-10-03 22:38:25 +02:00
787 changed files with 14365 additions and 38883 deletions
--- a/.codio
+++ b/.codio
@@ -0,0 +1,14 @@
 {
 // Configure your Run and Preview buttons here.
 // Run button configuration
  "commands": {
        "Run Meteor": "cd rpg-docs \n ROOT_URL=http://period-sheriff.codio.io:3000 meteor"
  },
 // Preview button configuration
  "preview": {
      "Prieview": "http://period-sheriff-3000.codio.io",
 	  "Ungit": "https://period-sheriff-9501.codio.io/#/repository?path=/home/codio/workspace"
  }
 }
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,13 @@
 <component name="InspectionProjectProfileManager">
  <profile version="1.0">
    <option name="myName" value="Project Default" />
    <inspection_tool class="HtmlUnknownAttribute" enabled="false" level="WARNING" enabled_by_default="false">
      <option name="myValues">
        <value>
          <list size="0" />
        </value>
      </option>
      <option name="myCustomValuesEnabled" value="true" />
    </inspection_tool>
  </profile>
 </component>
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,7 @@
 <component name="InspectionProjectProfileManager">
  <settings>
    <option name="PROJECT_PROFILE" value="Project Default" />
    <option name="USE_PROJECT_PROFILE" value="true" />
    <version value="1.0" />
  </settings>
 </component>
--- a/.jscsrc
+++ b/.jscsrc
@@ -0,0 +1,56 @@
 {
 	"requireOperatorBeforeLineBreak": true,
 	"requireCamelCaseOrUpperCaseIdentifiers": true,
 	"maximumLineLength": {
 		"value": 80,
 		"allowComments": true,
 		"allowRegex": true
 	},
 	"validateIndentation": "\t",
 	"validateQuoteMarks": "\"",
 	"disallowMultipleLineStrings": true,
 	"disallowMixedSpacesAndTabs": "smart",
 	"disallowTrailingWhitespace": true,
 	"disallowSpaceAfterPrefixUnaryOperators": true,
 	"disallowMultipleVarDecl": true,
 	"disallowNewlineBeforeBlockStatements": true,
 	"disallowKeywordsOnNewLine": ["else"],
 	"requireSpaceAfterKeywords": [
 		"if",
 		"else",
 		"for",
 		"while",
 		"do",
 		"switch",
 		"return",
 		"try",
 		"catch"
 	],
 	"requireSpaceBeforeBinaryOperators": [
 		"=", "+=", "-=", "*=", "/=", "%=", "<<=", ">>=", ">>>=",
 		"&=", "|=", "^=", "+=",
 		"+", "-", "*", "/", "%", "<<", ">>", ">>>", "&",
 		"|", "^", "&&", "||", "===", "==", ">=",
 		"<=", "<", ">", "!=", "!=="
 	],
 	"requireSpaceAfterBinaryOperators": true,
 	"requireSpacesInConditionalExpression": true,
 	"requireSpacesInForStatement": true,
 	"requireTrailingComma": {
 		"ignoreSingleValue": true,
 		"ignoreSingleLine": true
 	},
 	"requireLineFeedAtFileEnd": true,
 	"disallowSpacesInAnonymousFunctionExpression": {
 		"beforeOpeningRoundBrace": true
 	},
 	"disallowSpacesInsideObjectBrackets": "all",
 	"disallowSpacesInsideArrayBrackets": "all",
 	"disallowSpacesInsideParentheses": true,
 	"disallowMultipleLineBreaks": true,
 	"disallowNewlineBeforeBlockStatements": true
 }
--- a/.jshintrc
+++ b/.jshintrc
@@ -0,0 +1,3 @@
 {
 	"undef": false
 }
--- a/14
+++ b/14
@@ -1,14 +0,0 @@
 FROM ubuntu:latest
 RUN apt-get update --quiet \
    && apt-get install --quiet --yes \
    bsdtar \
    curl \
    git
 RUN ln --symbolic --force $(which bsdtar) $(which tar)
 RUN useradd --create-home --shell /bin/bash dicecloud
 USER dicecloud
 WORKDIR /home/dicecloud
 RUN curl https://install.meteor.com/?release=1.8.0.2 | sh
 ENV PATH="${PATH}:/home/dicecloud/.meteor"
 COPY dev.sh ./dev.sh
 ENTRYPOINT ./dev.sh
--- a/License.md
+++ b/License.md
@@ -1,674 +0,0 @@
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007
 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
                            Preamble
  The GNU General Public License is a free, copyleft license for
 software and other kinds of works.
  The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
 the GNU General Public License is intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
 software for all its users.  We, the Free Software Foundation, use the
 GNU General Public License for most of our software; it applies also to
 any other work released this way by its authors.  You can apply it to
 your programs, too.
  When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
 them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
  To protect your rights, we need to prevent others from denying you
 these rights or asking you to surrender the rights.  Therefore, you have
 certain responsibilities if you distribute copies of the software, or if
 you modify it: responsibilities to respect the freedom of others.
  For example, if you distribute copies of such a program, whether
 gratis or for a fee, you must pass on to the recipients the same
 freedoms that you received.  You must make sure that they, too, receive
 or can get the source code.  And you must show them these terms so they
 know their rights.
  Developers that use the GNU GPL protect your rights with two steps:
 (1) assert copyright on the software, and (2) offer you this License
 giving you legal permission to copy, distribute and/or modify it.
  For the developers' and authors' protection, the GPL clearly explains
 that there is no warranty for this free software.  For both users' and
 authors' sake, the GPL requires that modified versions be marked as
 changed, so that their problems will not be attributed erroneously to
 authors of previous versions.
  Some devices are designed to deny users access to install or run
 modified versions of the software inside them, although the manufacturer
 can do so.  This is fundamentally incompatible with the aim of
 protecting users' freedom to change the software.  The systematic
 pattern of such abuse occurs in the area of products for individuals to
 use, which is precisely where it is most unacceptable.  Therefore, we
 have designed this version of the GPL to prohibit the practice for those
 products.  If such problems arise substantially in other domains, we
 stand ready to extend this provision to those domains in future versions
 of the GPL, as needed to protect the freedom of users.
  Finally, every program is threatened constantly by software patents.
 States should not allow patents to restrict development and use of
 software on general-purpose computers, but in those that do, we wish to
 avoid the special danger that patents applied to a free program could
 make it effectively proprietary.  To prevent this, the GPL assures that
 patents cannot be used to render the program non-free.
  The precise terms and conditions for copying, distribution and
 modification follow.
                       TERMS AND CONDITIONS
  0. Definitions.
  "This License" refers to version 3 of the GNU General Public License.
  "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
  "The Program" refers to any copyrightable work licensed under this
 License.  Each licensee is addressed as "you".  "Licensees" and
 "recipients" may be individuals or organizations.
  To "modify" a work means to copy from or adapt all or part of the work
 in a fashion requiring copyright permission, other than the making of an
 exact copy.  The resulting work is called a "modified version" of the
 earlier work or a work "based on" the earlier work.
  A "covered work" means either the unmodified Program or a work based
 on the Program.
  To "propagate" a work means to do anything with it that, without
 permission, would make you directly or secondarily liable for
 infringement under applicable copyright law, except executing it on a
 computer or modifying a private copy.  Propagation includes copying,
 distribution (with or without modification), making available to the
 public, and in some countries other activities as well.
  To "convey" a work means any kind of propagation that enables other
 parties to make or receive copies.  Mere interaction with a user through
 a computer network, with no transfer of a copy, is not conveying.
  An interactive user interface displays "Appropriate Legal Notices"
 to the extent that it includes a convenient and prominently visible
 feature that (1) displays an appropriate copyright notice, and (2)
 tells the user that there is no warranty for the work (except to the
 extent that warranties are provided), that licensees may convey the
 work under this License, and how to view a copy of this License.  If
 the interface presents a list of user commands or options, such as a
 menu, a prominent item in the list meets this criterion.
  1. Source Code.
  The "source code" for a work means the preferred form of the work
 for making modifications to it.  "Object code" means any non-source
 form of a work.
  A "Standard Interface" means an interface that either is an official
 standard defined by a recognized standards body, or, in the case of
 interfaces specified for a particular programming language, one that
 is widely used among developers working in that language.
  The "System Libraries" of an executable work include anything, other
 than the work as a whole, that (a) is included in the normal form of
 packaging a Major Component, but which is not part of that Major
 Component, and (b) serves only to enable use of the work with that
 Major Component, or to implement a Standard Interface for which an
 implementation is available to the public in source code form.  A
 "Major Component", in this context, means a major essential component
 (kernel, window system, and so on) of the specific operating system
 (if any) on which the executable work runs, or a compiler used to
 produce the work, or an object code interpreter used to run it.
  The "Corresponding Source" for a work in object code form means all
 the source code needed to generate, install, and (for an executable
 work) run the object code and to modify the work, including scripts to
 control those activities.  However, it does not include the work's
 System Libraries, or general-purpose tools or generally available free
 programs which are used unmodified in performing those activities but
 which are not part of the work.  For example, Corresponding Source
 includes interface definition files associated with source files for
 the work, and the source code for shared libraries and dynamically
 linked subprograms that the work is specifically designed to require,
 such as by intimate data communication or control flow between those
 subprograms and other parts of the work.
  The Corresponding Source need not include anything that users
 can regenerate automatically from other parts of the Corresponding
 Source.
  The Corresponding Source for a work in source code form is that
 same work.
  2. Basic Permissions.
  All rights granted under this License are granted for the term of
 copyright on the Program, and are irrevocable provided the stated
 conditions are met.  This License explicitly affirms your unlimited
 permission to run the unmodified Program.  The output from running a
 covered work is covered by this License only if the output, given its
 content, constitutes a covered work.  This License acknowledges your
 rights of fair use or other equivalent, as provided by copyright law.
  You may make, run and propagate covered works that you do not
 convey, without conditions so long as your license otherwise remains
 in force.  You may convey covered works to others for the sole purpose
 of having them make modifications exclusively for you, or provide you
 with facilities for running those works, provided that you comply with
 the terms of this License in conveying all material for which you do
 not control copyright.  Those thus making or running the covered works
 for you must do so exclusively on your behalf, under your direction
 and control, on terms that prohibit them from making any copies of
 your copyrighted material outside their relationship with you.
  Conveying under any other circumstances is permitted solely under
 the conditions stated below.  Sublicensing is not allowed; section 10
 makes it unnecessary.
  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
  No covered work shall be deemed part of an effective technological
 measure under any applicable law fulfilling obligations under article
 11 of the WIPO copyright treaty adopted on 20 December 1996, or
 similar laws prohibiting or restricting circumvention of such
 measures.
  When you convey a covered work, you waive any legal power to forbid
 circumvention of technological measures to the extent such circumvention
 is effected by exercising rights under this License with respect to
 the covered work, and you disclaim any intention to limit operation or
 modification of the work as a means of enforcing, against the work's
 users, your or third parties' legal rights to forbid circumvention of
 technological measures.
  4. Conveying Verbatim Copies.
  You may convey verbatim copies of the Program's source code as you
 receive it, in any medium, provided that you conspicuously and
 appropriately publish on each copy an appropriate copyright notice;
 keep intact all notices stating that this License and any
 non-permissive terms added in accord with section 7 apply to the code;
 keep intact all notices of the absence of any warranty; and give all
 recipients a copy of this License along with the Program.
  You may charge any price or no price for each copy that you convey,
 and you may offer support or warranty protection for a fee.
  5. Conveying Modified Source Versions.
  You may convey a work based on the Program, or the modifications to
 produce it from the Program, in the form of source code under the
 terms of section 4, provided that you also meet all of these conditions:
    a) The work must carry prominent notices stating that you modified
    it, and giving a relevant date.
    b) The work must carry prominent notices stating that it is
    released under this License and any conditions added under section
    7.  This requirement modifies the requirement in section 4 to
    "keep intact all notices".
    c) You must license the entire work, as a whole, under this
    License to anyone who comes into possession of a copy.  This
    License will therefore apply, along with any applicable section 7
    additional terms, to the whole of the work, and all its parts,
    regardless of how they are packaged.  This License gives no
    permission to license the work in any other way, but it does not
    invalidate such permission if you have separately received it.
    d) If the work has interactive user interfaces, each must display
    Appropriate Legal Notices; however, if the Program has interactive
    interfaces that do not display Appropriate Legal Notices, your
    work need not make them do so.
  A compilation of a covered work with other separate and independent
 works, which are not by their nature extensions of the covered work,
 and which are not combined with it such as to form a larger program,
 in or on a volume of a storage or distribution medium, is called an
 "aggregate" if the compilation and its resulting copyright are not
 used to limit the access or legal rights of the compilation's users
 beyond what the individual works permit.  Inclusion of a covered work
 in an aggregate does not cause this License to apply to the other
 parts of the aggregate.
  6. Conveying Non-Source Forms.
  You may convey a covered work in object code form under the terms
 of sections 4 and 5, provided that you also convey the
 machine-readable Corresponding Source under the terms of this License,
 in one of these ways:
    a) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by the
    Corresponding Source fixed on a durable physical medium
    customarily used for software interchange.
    b) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by a
    written offer, valid for at least three years and valid for as
    long as you offer spare parts or customer support for that product
    model, to give anyone who possesses the object code either (1) a
    copy of the Corresponding Source for all the software in the
    product that is covered by this License, on a durable physical
    medium customarily used for software interchange, for a price no
    more than your reasonable cost of physically performing this
    conveying of source, or (2) access to copy the
    Corresponding Source from a network server at no charge.
    c) Convey individual copies of the object code with a copy of the
    written offer to provide the Corresponding Source.  This
    alternative is allowed only occasionally and noncommercially, and
    only if you received the object code with such an offer, in accord
    with subsection 6b.
    d) Convey the object code by offering access from a designated
    place (gratis or for a charge), and offer equivalent access to the
    Corresponding Source in the same way through the same place at no
    further charge.  You need not require recipients to copy the
    Corresponding Source along with the object code.  If the place to
    copy the object code is a network server, the Corresponding Source
    may be on a different server (operated by you or a third party)
    that supports equivalent copying facilities, provided you maintain
    clear directions next to the object code saying where to find the
    Corresponding Source.  Regardless of what server hosts the
    Corresponding Source, you remain obligated to ensure that it is
    available for as long as needed to satisfy these requirements.
    e) Convey the object code using peer-to-peer transmission, provided
    you inform other peers where the object code and Corresponding
    Source of the work are being offered to the general public at no
    charge under subsection 6d.
  A separable portion of the object code, whose source code is excluded
 from the Corresponding Source as a System Library, need not be
 included in conveying the object code work.
  A "User Product" is either (1) a "consumer product", which means any
 tangible personal property which is normally used for personal, family,
 or household purposes, or (2) anything designed or sold for incorporation
 into a dwelling.  In determining whether a product is a consumer product,
 doubtful cases shall be resolved in favor of coverage.  For a particular
 product received by a particular user, "normally used" refers to a
 typical or common use of that class of product, regardless of the status
 of the particular user or of the way in which the particular user
 actually uses, or expects or is expected to use, the product.  A product
 is a consumer product regardless of whether the product has substantial
 commercial, industrial or non-consumer uses, unless such uses represent
 the only significant mode of use of the product.
  "Installation Information" for a User Product means any methods,
 procedures, authorization keys, or other information required to install
 and execute modified versions of a covered work in that User Product from
 a modified version of its Corresponding Source.  The information must
 suffice to ensure that the continued functioning of the modified object
 code is in no case prevented or interfered with solely because
 modification has been made.
  If you convey an object code work under this section in, or with, or
 specifically for use in, a User Product, and the conveying occurs as
 part of a transaction in which the right of possession and use of the
 User Product is transferred to the recipient in perpetuity or for a
 fixed term (regardless of how the transaction is characterized), the
 Corresponding Source conveyed under this section must be accompanied
 by the Installation Information.  But this requirement does not apply
 if neither you nor any third party retains the ability to install
 modified object code on the User Product (for example, the work has
 been installed in ROM).
  The requirement to provide Installation Information does not include a
 requirement to continue to provide support service, warranty, or updates
 for a work that has been modified or installed by the recipient, or for
 the User Product in which it has been modified or installed.  Access to a
 network may be denied when the modification itself materially and
 adversely affects the operation of the network or violates the rules and
 protocols for communication across the network.
  Corresponding Source conveyed, and Installation Information provided,
 in accord with this section must be in a format that is publicly
 documented (and with an implementation available to the public in
 source code form), and must require no special password or key for
 unpacking, reading or copying.
  7. Additional Terms.
  "Additional permissions" are terms that supplement the terms of this
 License by making exceptions from one or more of its conditions.
 Additional permissions that are applicable to the entire Program shall
 be treated as though they were included in this License, to the extent
 that they are valid under applicable law.  If additional permissions
 apply only to part of the Program, that part may be used separately
 under those permissions, but the entire Program remains governed by
 this License without regard to the additional permissions.
  When you convey a copy of a covered work, you may at your option
 remove any additional permissions from that copy, or from any part of
 it.  (Additional permissions may be written to require their own
 removal in certain cases when you modify the work.)  You may place
 additional permissions on material, added by you to a covered work,
 for which you have or can give appropriate copyright permission.
  Notwithstanding any other provision of this License, for material you
 add to a covered work, you may (if authorized by the copyright holders of
 that material) supplement the terms of this License with terms:
    a) Disclaiming warranty or limiting liability differently from the
    terms of sections 15 and 16 of this License; or
    b) Requiring preservation of specified reasonable legal notices or
    author attributions in that material or in the Appropriate Legal
    Notices displayed by works containing it; or
    c) Prohibiting misrepresentation of the origin of that material, or
    requiring that modified versions of such material be marked in
    reasonable ways as different from the original version; or
    d) Limiting the use for publicity purposes of names of licensors or
    authors of the material; or
    e) Declining to grant rights under trademark law for use of some
    trade names, trademarks, or service marks; or
    f) Requiring indemnification of licensors and authors of that
    material by anyone who conveys the material (or modified versions of
    it) with contractual assumptions of liability to the recipient, for
    any liability that these contractual assumptions directly impose on
    those licensors and authors.
  All other non-permissive additional terms are considered "further
 restrictions" within the meaning of section 10.  If the Program as you
 received it, or any part of it, contains a notice stating that it is
 governed by this License along with a term that is a further
 restriction, you may remove that term.  If a license document contains
 a further restriction but permits relicensing or conveying under this
 License, you may add to a covered work material governed by the terms
 of that license document, provided that the further restriction does
 not survive such relicensing or conveying.
  If you add terms to a covered work in accord with this section, you
 must place, in the relevant source files, a statement of the
 additional terms that apply to those files, or a notice indicating
 where to find the applicable terms.
  Additional terms, permissive or non-permissive, may be stated in the
 form of a separately written license, or stated as exceptions;
 the above requirements apply either way.
  8. Termination.
  You may not propagate or modify a covered work except as expressly
 provided under this License.  Any attempt otherwise to propagate or
 modify it is void, and will automatically terminate your rights under
 this License (including any patent licenses granted under the third
 paragraph of section 11).
  However, if you cease all violation of this License, then your
 license from a particular copyright holder is reinstated (a)
 provisionally, unless and until the copyright holder explicitly and
 finally terminates your license, and (b) permanently, if the copyright
 holder fails to notify you of the violation by some reasonable means
 prior to 60 days after the cessation.
  Moreover, your license from a particular copyright holder is
 reinstated permanently if the copyright holder notifies you of the
 violation by some reasonable means, this is the first time you have
 received notice of violation of this License (for any work) from that
 copyright holder, and you cure the violation prior to 30 days after
 your receipt of the notice.
  Termination of your rights under this section does not terminate the
 licenses of parties who have received copies or rights from you under
 this License.  If your rights have been terminated and not permanently
 reinstated, you do not qualify to receive new licenses for the same
 material under section 10.
  9. Acceptance Not Required for Having Copies.
  You are not required to accept this License in order to receive or
 run a copy of the Program.  Ancillary propagation of a covered work
 occurring solely as a consequence of using peer-to-peer transmission
 to receive a copy likewise does not require acceptance.  However,
 nothing other than this License grants you permission to propagate or
 modify any covered work.  These actions infringe copyright if you do
 not accept this License.  Therefore, by modifying or propagating a
 covered work, you indicate your acceptance of this License to do so.
  10. Automatic Licensing of Downstream Recipients.
  Each time you convey a covered work, the recipient automatically
 receives a license from the original licensors, to run, modify and
 propagate that work, subject to this License.  You are not responsible
 for enforcing compliance by third parties with this License.
  An "entity transaction" is a transaction transferring control of an
 organization, or substantially all assets of one, or subdividing an
 organization, or merging organizations.  If propagation of a covered
 work results from an entity transaction, each party to that
 transaction who receives a copy of the work also receives whatever
 licenses to the work the party's predecessor in interest had or could
 give under the previous paragraph, plus a right to possession of the
 Corresponding Source of the work from the predecessor in interest, if
 the predecessor has it or can get it with reasonable efforts.
  You may not impose any further restrictions on the exercise of the
 rights granted or affirmed under this License.  For example, you may
 not impose a license fee, royalty, or other charge for exercise of
 rights granted under this License, and you may not initiate litigation
 (including a cross-claim or counterclaim in a lawsuit) alleging that
 any patent claim is infringed by making, using, selling, offering for
 sale, or importing the Program or any portion of it.
  11. Patents.
  A "contributor" is a copyright holder who authorizes use under this
 License of the Program or a work on which the Program is based.  The
 work thus licensed is called the contributor's "contributor version".
  A contributor's "essential patent claims" are all patent claims
 owned or controlled by the contributor, whether already acquired or
 hereafter acquired, that would be infringed by some manner, permitted
 by this License, of making, using, or selling its contributor version,
 but do not include claims that would be infringed only as a
 consequence of further modification of the contributor version.  For
 purposes of this definition, "control" includes the right to grant
 patent sublicenses in a manner consistent with the requirements of
 this License.
  Each contributor grants you a non-exclusive, worldwide, royalty-free
 patent license under the contributor's essential patent claims, to
 make, use, sell, offer for sale, import and otherwise run, modify and
 propagate the contents of its contributor version.
  In the following three paragraphs, a "patent license" is any express
 agreement or commitment, however denominated, not to enforce a patent
 (such as an express permission to practice a patent or covenant not to
 sue for patent infringement).  To "grant" such a patent license to a
 party means to make such an agreement or commitment not to enforce a
 patent against the party.
  If you convey a covered work, knowingly relying on a patent license,
 and the Corresponding Source of the work is not available for anyone
 to copy, free of charge and under the terms of this License, through a
 publicly available network server or other readily accessible means,
 then you must either (1) cause the Corresponding Source to be so
 available, or (2) arrange to deprive yourself of the benefit of the
 patent license for this particular work, or (3) arrange, in a manner
 consistent with the requirements of this License, to extend the patent
 license to downstream recipients.  "Knowingly relying" means you have
 actual knowledge that, but for the patent license, your conveying the
 covered work in a country, or your recipient's use of the covered work
 in a country, would infringe one or more identifiable patents in that
 country that you have reason to believe are valid.
  If, pursuant to or in connection with a single transaction or
 arrangement, you convey, or propagate by procuring conveyance of, a
 covered work, and grant a patent license to some of the parties
 receiving the covered work authorizing them to use, propagate, modify
 or convey a specific copy of the covered work, then the patent license
 you grant is automatically extended to all recipients of the covered
 work and works based on it.
  A patent license is "discriminatory" if it does not include within
 the scope of its coverage, prohibits the exercise of, or is
 conditioned on the non-exercise of one or more of the rights that are
 specifically granted under this License.  You may not convey a covered
 work if you are a party to an arrangement with a third party that is
 in the business of distributing software, under which you make payment
 to the third party based on the extent of your activity of conveying
 the work, and under which the third party grants, to any of the
 parties who would receive the covered work from you, a discriminatory
 patent license (a) in connection with copies of the covered work
 conveyed by you (or copies made from those copies), or (b) primarily
 for and in connection with specific products or compilations that
 contain the covered work, unless you entered into that arrangement,
 or that patent license was granted, prior to 28 March 2007.
  Nothing in this License shall be construed as excluding or limiting
 any implied license or other defenses to infringement that may
 otherwise be available to you under applicable patent law.
  12. No Surrender of Others' Freedom.
  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
 excuse you from the conditions of this License.  If you cannot convey a
 covered work so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you may
 not convey it at all.  For example, if you agree to terms that obligate you
 to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
  13. Use with the GNU Affero General Public License.
  Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
 under version 3 of the GNU Affero General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
 but the special requirements of the GNU Affero General Public License,
 section 13, concerning interaction through a network will apply to the
 combination as such.
  14. Revised Versions of this License.
  The Free Software Foundation may publish revised and/or new versions of
 the GNU General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
  Each version is given a distinguishing version number.  If the
 Program specifies that a certain numbered version of the GNU General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
 GNU General Public License, you may choose any version ever published
 by the Free Software Foundation.
  If the Program specifies that a proxy can decide which future
 versions of the GNU General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
  Later license versions may give you additional or different
 permissions.  However, no additional obligations are imposed on any
 author or copyright holder as a result of your choosing to follow a
 later version.
  15. Disclaimer of Warranty.
  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
 APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
 HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
 IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
 ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
  16. Limitation of Liability.
  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
 THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
 GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
 USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
 DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
 PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
 EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGES.
  17. Interpretation of Sections 15 and 16.
  If the disclaimer of warranty and limitation of liability provided
 above cannot be given local legal effect according to their terms,
 reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
                     END OF TERMS AND CONDITIONS
            How to Apply These Terms to Your New Programs
  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these terms.
  To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
    {one line to give the program's name and a brief idea of what it does.}
    Copyright (C) {year}  {name of author}
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Also add information on how to contact you by electronic and paper mail.
  If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
    {project}  Copyright (C) {year}  {fullname}
    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.
 The hypothetical commands `show w' and `show c' should show the appropriate
 parts of the General Public License.  Of course, your program's commands
 might be different; for a GUI interface, you would use an "about box".
  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
 <http://www.gnu.org/licenses/>.
  The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
 <http://www.gnu.org/philosophy/why-not-lgpl.html>.
--- a/README.md
+++ b/README.md
@@ -1,70 +1,4 @@
-DiceCloud
+RPG Docs
 ========
-This is the repo for [DiceCloud](dicecloud.com).
+This is the repo for [DiceCloud](dicecloud.com). The currently deployed version should always be the head of the master branch.
 DiceCloud is a free, auditable, real-time character sheet for D&D 5e.
 Philosophy
 ----------
 Setting up your character on DiceCloud takes a little longer than
 just filling it in on a paper character sheet would. The goal of using an
 online sheet is to make actually playing the game more streamlined, and
 ultimately more fun. So putting a little extra effort into setting up a
 character now pays off over and over again once you're playing.
 The idea is to track where each number comes from, and allow you to easily make
 changes on the fly. Let's look at a hypothetical example.
 > You need to swim through a sunken section of dungeon to fetch the quest's Thing.
 > You'll need to take off your magical Plate Armor of +1 Constitution to swim
 > without sinking, of course.
 >
 > Taking it off will take away that disadvantage on
 > stealth checks, change your armor class, your speed and your constitution, and
 > which in turn changes your hit points and your constitution saving throw.
 > Working out all those changes in the middle of a game will drag the game to a
 > halt.
 >
 > Fortunately you have DiceCloud, so it's a matter of dragging
 > your Plate Armor +1 Con from your "equipment" box to your "backpack" box and
 > you're done. Your hitpoints change correctly, your saving throws are up to date,
 > your armor class goes back to reflecting the fact that you have natural armor
 > from being a dragonborn. Your character sheet keeps up and you
 > ultimately get more time to play the game. Huzzah!
 Getting started
 ---------------
 Running DiceCloud locally, either to host it yourself away from an internet
 connection, or to contribute to developing it further, is fairly
 straightforward and it should work on Linux, Windows, and Mac.
 You'll need to have installed:
 - [git](https://www.atlassian.com/git/tutorials/install-git)
 - [Meteor](https://www.meteor.com/install)
 Then, it's just a matter of cloning this repository into a folder, and running
 `meteor` in the app directory.
 `git clone https://github.com/ThaumRystra/DiceCloud dicecloud`  
 `cd dicecloud`  
 `cd app`  
 `meteor npm install`  
 `meteor`
 You should see this:
 ```
 => Started proxy.
 => [HMR] Dev server listening on port 3003.
 => Started MongoDB.
 => Started your app.
 => App running at: http://localhost:3000/
 ```
 Now, visiting [](http://localhost:3000/) should show you an empty instance of
 DiceCloud running.
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1,11 +0,0 @@
 .meteor/local
 .meteor/meteorite
 .demeteorized
 .cache
 settings.json
 public/components
 public/_imports.html
 private/oldClient
 nohup.out
 node_modules
 dump
--- a/app/.meteor/packages
+++ b/app/.meteor/packages
@@ -1,55 +0,0 @@
 # Meteor packages used by this project, one per line.
 #
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 accounts-password@1.6.2
 accounts-ui@1.3.1
 random@1.2.0
 dburles:collection-helpers
 reactive-var@1.0.11
 underscore@1.0.10
 momentjs:moment
 dburles:mongo-collection-instances
 percolate:migrations
 accounts-google@1.3.3
 email@2.0.0
 meteorhacks:subs-manager
 chuangbo:marked
 meteor-base@1.4.0
 mobile-experience@1.1.0
 mongo@1.10.0
 session@1.2.0
 jquery@1.11.10
 tracker@1.2.0
 logging@1.1.20
 reload@1.3.0
 ejson@1.1.1
 check@1.3.1
 standard-minifier-js@2.6.0
 shell-server@0.5.0
 seba:minifiers-autoprefixer
 templates:array
 ecmascript@0.14.3
 es5-shim@4.8.0
 reactive-dict@1.3.0
 percolate:synced-cron
 ongoworks:speakingurl
 service-configuration@1.0.11
 google-config-ui@1.0.1
 dynamic-import@0.5.2
 ddp-rate-limiter@1.0.9
 rate-limit@1.0.9
 meteortesting:mocha
 mdg:validated-method
 akryum:vue-router2
 static-html
 aldeed:collection2@3.0.0
 aldeed:schema-index
 akryum:vue-component
 accounts-patreon
 bozhao:link-accounts
 peerlibrary:reactive-publish
 simple:rest
 simple:rest-method-mixin
 mikowals:batch-insert
--- a/app/.meteor/release
+++ b/app/.meteor/release
@@ -1 +0,0 @@
 METEOR@1.11.1
--- a/app/.meteor/versions
+++ b/app/.meteor/versions
@@ -1,138 +0,0 @@
 accounts-base@1.7.0
 accounts-google@1.3.3
 accounts-oauth@1.2.0
 accounts-password@1.6.2
 accounts-patreon@0.1.0
 accounts-ui@1.3.1
 accounts-ui-unstyled@1.4.2
 akryum:npm-check@0.1.2
 akryum:vue-component@0.15.2
 akryum:vue-component-dev-client@0.4.7
 akryum:vue-component-dev-server@0.1.4
 akryum:vue-router2@0.2.3
 aldeed:collection2@3.2.1
 aldeed:schema-index@3.0.0
 allow-deny@1.1.0
 autoupdate@1.6.0
 babel-compiler@7.5.3
 babel-runtime@1.5.0
 base64@1.0.12
 binary-heap@1.0.11
 blaze@2.3.4
 blaze-tools@1.0.10
 boilerplate-generator@1.7.1
 bozhao:link-accounts@2.2.1
 caching-compiler@1.2.2
 caching-html-compiler@1.1.3
 callback-hook@1.3.0
 check@1.3.1
 chuangbo:marked@0.3.5_1
 coffeescript@2.4.1
 coffeescript-compiler@2.4.1
 dburles:collection-helpers@1.1.0
 dburles:mongo-collection-instances@0.3.5
 ddp@1.4.0
 ddp-client@2.3.3
 ddp-common@1.4.0
 ddp-rate-limiter@1.0.9
 ddp-server@2.3.2
 deps@1.0.12
 diff-sequence@1.1.1
 dynamic-import@0.5.3
 ecmascript@0.14.3
 ecmascript-runtime@0.7.0
 ecmascript-runtime-client@0.11.0
 ecmascript-runtime-server@0.10.0
 ejson@1.1.1
 email@2.0.0
 es5-shim@4.8.0
 fetch@0.1.1
 geojson-utils@1.0.10
 google-config-ui@1.0.1
 google-oauth@1.3.0
 hot-code-push@1.0.4
 html-tools@1.0.11
 htmljs@1.0.11
 http@1.4.2
 id-map@1.1.0
 inter-process-messaging@0.1.1
 jquery@1.11.11
 lai:collection-extensions@0.2.1_1
 launch-screen@1.2.0
 less@2.8.0
 livedata@1.0.18
 lmieulet:meteor-coverage@1.1.4
 localstorage@1.2.0
 logging@1.1.20
 mdg:validated-method@1.2.0
 meteor@1.9.3
 meteor-base@1.4.0
 meteorhacks:picker@1.0.3
 meteorhacks:subs-manager@1.6.4
 meteortesting:browser-tests@1.3.4
 meteortesting:mocha@1.1.5
 meteortesting:mocha-core@7.0.1
 mikowals:batch-insert@1.2.0
 minifier-css@1.5.3
 minifier-js@2.6.0
 minimongo@1.6.0
 mobile-experience@1.1.0
 mobile-status-bar@1.1.0
 modern-browsers@0.1.5
 modules@0.15.0
 modules-runtime@0.12.0
 momentjs:moment@2.29.1
 mongo@1.10.0
 mongo-decimal@0.1.1
 mongo-dev-server@1.1.0
 mongo-id@1.0.7
 npm-bcrypt@0.9.3
 npm-mongo@3.8.1
 oauth@1.3.2
 oauth2@1.3.0
 observe-sequence@1.0.16
 ongoworks:speakingurl@9.0.0
 ordered-dict@1.1.0
 patreon-oauth@0.1.0
 peerlibrary:assert@0.3.0
 peerlibrary:extend-publish@0.6.0
 peerlibrary:fiber-utils@0.10.0
 peerlibrary:reactive-mongo@0.4.0
 peerlibrary:reactive-publish@0.10.0
 peerlibrary:server-autorun@0.8.0
 percolate:migrations@0.9.8
 percolate:synced-cron@1.3.2
 promise@0.11.2
 raix:eventemitter@0.1.3
 random@1.2.0
 rate-limit@1.0.9
 reactive-dict@1.3.0
 reactive-var@1.0.11
 reload@1.3.0
 retry@1.1.0
 routepolicy@1.1.0
 seba:minifiers-autoprefixer@1.2.1
 service-configuration@1.0.11
 session@1.2.0
 sha@1.0.9
 shell-server@0.5.0
 simple:json-routes@2.1.0
 simple:rest@1.1.1
 simple:rest-method-mixin@1.0.1
 socket-stream-client@0.3.1
 spacebars@1.0.15
 spacebars-compiler@1.1.3
 srp@1.1.0
 standard-minifier-js@2.6.0
 static-html@1.2.2
 templates:array@1.0.3
 templating@1.3.2
 templating-compiler@1.3.3
 templating-runtime@1.3.2
 templating-tools@1.1.2
 tmeasday:check-npm-versions@0.3.2
 tracker@1.2.0
 underscore@1.0.10
 url@1.3.1
 webapp@1.9.1
 webapp-hashing@1.0.9
--- a/app/client/index.html
+++ b/app/client/index.html
@@ -1,3 +0,0 @@
 <body>
  <div id="app"></div>
 </body>
--- a/app/client/main.js
+++ b/app/client/main.js
@@ -1,3 +0,0 @@
 import '/imports/ui/vueSetup.js';
 import '/imports/ui/styles/stylesIndex.js';
 import '/imports/ui/styles/stylesIndex.js';
--- a/app/imports/api/creature/CreatureProperties.js
+++ b/app/imports/api/creature/CreatureProperties.js
@@ -1,598 +0,0 @@
 import { Meteor } from 'meteor/meteor';
 import { Mongo } from 'meteor/mongo';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import SimpleSchema from 'simpl-schema';
 import ColorSchema from '/imports/api/properties/subSchemas/ColorSchema.js';
 import ChildSchema, { RefSchema } from '/imports/api/parenting/ChildSchema.js';
 import { recomputeCreature } from '/imports/api/creature/computation/recomputeCreature.js';
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
 import Creatures from '/imports/api/creature/Creatures.js';
 import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
 import { softRemove, restore } from '/imports/api/parenting/softRemove.js';
 import SoftRemovableSchema from '/imports/api/parenting/SoftRemovableSchema.js';
 import propertySchemasIndex from '/imports/api/properties/computedPropertySchemasIndex.js';
 import {
 	setLineageOfDocs,
 	getAncestry,
 	renewDocIds
 } from '/imports/api/parenting/parenting.js';
 import {setDocToLastOrder} from '/imports/api/parenting/order.js';
 import { storedIconsSchema } from '/imports/api/icons/Icons.js';
 import { reorderDocs } from '/imports/api/parenting/order.js';
 import '/imports/api/creature/actions/doAction.js';
 import '/imports/api/creature/creatureProperties/manageEquipment.js';
 let CreatureProperties = new Mongo.Collection('creatureProperties');
 let CreaturePropertySchema = new SimpleSchema({
 	type: {
    type: String,
    allowedValues: Object.keys(propertySchemasIndex),
  },
 	tags: {
 		type: Array,
 		defaultValue: [],
 	},
 	'tags.$': {
 		type: String,
 	},
 	disabled: {
 		type: Boolean,
 		optional: true,
 	},
  icon: {
    type: storedIconsSchema,
    optional: true,
  },
  // Denormalised flag if this property is inactive on the sheet for any reason
  // Including being disabled, or a decendent of a disabled property
  inactive: {
    type: Boolean,
    optional: true,
    index: 1,
  },
  // Denormalised flag if this property was made inactive by an inactive
  // ancestor. True if this property has an inactive ancestor even if this
  // property is itself inactive
  deactivatedByAncestor: {
    type: Boolean,
    optional: true,
    index: 1,
  },
 });
 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}
 	});
 }
 export function getCreature(property){
  if (!property) throw new Meteor.Error('No property provided');
  let creature = Creatures.findOne(property.ancestors[0].id);
  if (!creature) throw new Meteor.Error('Creature does not exist');
  return creature;
 }
 function assertPropertyEditPermission(property, userId){
  let creature = getCreature(property);
  return assertEditPermission(creature, userId);
 }
 function recomputeCreatures(property){
 	for (let ref of property.ancestors){
 		if (ref.collection === 'creatures') {
      reorderDocs({collection: CreatureProperties, ancestorId: ref.id});
 			recomputeCreature.call({charId: ref.id});
 		}
 	}
 }
 const insertProperty = new ValidatedMethod({
  name: 'creatureProperties.insert',
 	validate: null,
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
  run({creatureProperty}) {
    delete creatureProperty._id;
    assertPropertyEditPermission(creatureProperty, this.userId);
 		let _id = CreatureProperties.insert(creatureProperty);
 		let property = CreatureProperties.findOne(_id);
 		recomputeCreatures(property);
  },
 });
 const duplicateProperty = new ValidatedMethod({
  name: 'creatureProperties.duplicate',
  validate: new SimpleSchema({
    _id: {
      type: String,
      regEx: SimpleSchema.RegEx.Id,
    }
  }).validator(),
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
  run({_id}) {
    let creatureProperty = CreatureProperties.findOne(_id);
    assertPropertyEditPermission(creatureProperty, this.userId);
    delete creatureProperty._id;
 		CreatureProperties.insert(creatureProperty);
    recomputeCreatures(creatureProperty);
  },
 });
 const insertPropertyFromLibraryNode = new ValidatedMethod({
 	name: 'creatureProperties.insertPropertyFromLibraryNode',
 	validate: new SimpleSchema({
 		nodeId: {
 			type: String,
 			regEx: SimpleSchema.RegEx.Id,
 		},
 		parentRef: {
 			type: RefSchema,
 		},
 	}).validator(),
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
 	run({nodeId, parentRef}) {
 		// get the new ancestry for the properties
 		let {parentDoc, ancestors} = getAncestry({parentRef});
 		// Check permission to edit
 		if (parentRef.collection === 'creatures'){
 			assertEditPermission(parentDoc, this.userId);
 		} else if (parentRef.collection === 'creatureProperties'){
 			assertPropertyEditPermission(parentDoc, this.userId);
 		} else {
 			throw `${parentRef.collection} is not a valid parent collection`
 		}
 		// Fetch the library node and its decendents, provided they have not been
 		// removed
 		let node = LibraryNodes.findOne({
 			_id: nodeId,
 			removed: {$ne: true},
 		});
 		if (!node) throw `Node not found for nodeId: ${nodeId}`;
 		let oldParent = node.parent;
 		let nodes = LibraryNodes.find({
 			'ancestors.id': nodeId,
 			removed: {$ne: true},
 		}).fetch();
    // The root node is last in the array of nodes
 		nodes.push(node);
 		// re-map all the ancestors
 		setLineageOfDocs({
 			docArray: nodes,
 			newAncestry: ancestors,
 			oldParent,
 		});
 		// Give the docs new IDs without breaking internal references
 		renewDocIds({
 			docArray: nodes,
 			collectionMap: {'libraryNodes': 'creatureProperties'}
 		});
 		// Order the root node
 		setDocToLastOrder({
 			collection: CreatureProperties,
 			doc: node,
 		});
 		// Insert the creature properties
    let insertedDocIds = CreatureProperties.batchInsert(nodes);
    // get the root inserted doc
    let rootId = insertedDocIds[insertedDocIds.length - 1];
 		// Recompute the creatures doc was attached to
 		recomputeCreatures(node);
 		// Return the docId of the last property, the inserted root property
 		return rootId;
 	},
 })
 const updateProperty = new ValidatedMethod({
  name: 'creatureProperties.update',
  validate({_id, path}){
 		if (!_id) throw new Meteor.Error('No _id', '_id is required');
 		// We cannot change these fields with a simple update
 		switch (path[0]){
 			case 'type':
      case 'order':
      case 'parent':
      case 'ancestors':
 			case 'damage':
 				throw new Meteor.Error('Permission denied',
 				'This property can\'t be updated directly');
 		}
  },
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
  run({_id, path, value}) {
    let property = CreatureProperties.findOne(_id);
    assertPropertyEditPermission(property, this.userId);
    let pathString = path.join('.');
    let modifier;
    // unset empty values
    if (value === null || value === undefined){
      modifier = {$unset: {[pathString]: 1}};
    } else {
      modifier = {$set: {[pathString]: value}};
    }
 		CreatureProperties.update(_id, modifier, {
 			selector: {type: property.type},
 		});
 		recomputeCreatures(property);
  },
 });
 export function damagePropertyWork({property, operation, value}){
  if (operation === 'set'){
    let currentValue = property.value;
    // Set represents what we want the value to be after damage
    // So we need the actual damage to get to that value
    let damage = currentValue - value;
    // Damage can't exceed total value
    if (damage > currentValue) damage = currentValue;
    // Damage must be positive
    if (damage < 0) damage = 0;
    CreatureProperties.update(property._id, {
      $set: {damage}
    }, {
      selector: property
    });
    return currentValue - damage;
  } else if (operation === 'increment'){
    let currentValue = property.value - (property.damage || 0);
    let currentDamage = property.damage;
    let increment = value;
    // Can't increase damage above the remaining value
    if (increment > currentValue) increment = currentValue;
    // Can't decrease damage below zero
    if (-increment > currentDamage) increment = -currentDamage;
    CreatureProperties.update(property._id, {
      $inc: {damage: increment}
    }, {
      selector: property
    });
    return increment;
  }
 }
 const damagePropertiesByName = new ValidatedMethod({
  name: 'CreatureProperties.damagePropertiesByName',
  validate: new SimpleSchema({
    creatureId: SimpleSchema.RegEx.Id,
    variableName: {
      type: String,
    },
    operation: {
      type: String,
      allowedValues: ['set', 'increment']
    },
    value: Number,
  }).validator(),
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 20,
    timeInterval: 5000,
  },
  run({creatureId, variableName, operation, value}) {
 		// Check permissions
    let creature = Creatures.findOne(creatureId, {
      fields: {
        damageMultipliers: 1,
        owner: 1,
        readers: 1,
        writers: 1,
      },
    });
    assertEditPermission(creature, this.userId);
    CreatureProperties.find({
      'ancestors.id': creatureId,
      variableName,
      removed: {$ne: false},
      inactive: {$ne: true},
    }).forEach(property => {
      // Check if property can take damage
      let schema = CreatureProperties.simpleSchema(property);
      if (!schema.allowsKey('damage')) return;
      // Damage the property
      damagePropertyWork({property: property, operation, value})
    });
    recomputeCreature.call({charId: creatureId});
  }
 })
 const damageProperty = new ValidatedMethod({
  name: 'creatureProperties.damage',
  validate: new SimpleSchema({
    _id: SimpleSchema.RegEx.Id,
    operation: {
      type: String,
      allowedValues: ['set', 'increment']
    },
    value: Number,
  }).validator(),
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 20,
    timeInterval: 5000,
  },
  run({_id, operation, value}) {
 		let currentProperty = CreatureProperties.findOne(_id);
 		// Check permissions
 		assertPropertyEditPermission(currentProperty, this.userId);
 		// Check if property can take damage
 		let schema = CreatureProperties.simpleSchema(currentProperty);
 		if (!schema.allowsKey('damage')){
 			throw new Meteor.Error(
 				'Damage property failed',
 				`Property of type "${currentProperty.type}" can't be damaged`
 			);
 		}
 		damagePropertyWork({property: currentProperty, operation, value})
 		recomputeCreatures(currentProperty);
  },
 });
 const dealDamage = new ValidatedMethod({
  name: 'creatureProperties.dealDamage',
  validate: new SimpleSchema({
    creatureId: SimpleSchema.RegEx.Id,
    damageType: {
      type: String,
    },
    amount: Number,
  }).validator(),
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 20,
    timeInterval: 5000,
  },
  run({creatureId, damageType, amount}) {
    let creature = Creatures.findOne(creatureId, {
      fields: {
        damageMultipliers: 1,
        owner: 1,
        readers: 1,
        writers: 1,
      },
    });
 		// Check permissions
    assertEditPermission(creature, this.userId);
    let healthBars = CreatureProperties.find({
      'ancestors.id': creatureId,
      type: 'attribute',
      attributeType:'healthBar',
      removed: {$ne: true},
      inactive: {$ne: true},
    }, {
      sort: {order: -1},
    });
    let multiplier = creature.damageMultipliers[damageType];
    if (multiplier === undefined) multiplier = 1;
    let totalDamage = Math.floor(amount * multiplier);
    let damageLeft = totalDamage;
    if (damageType === 'healing') damageLeft = -totalDamage;
    healthBars.forEach(healthBar => {
      if (damageLeft === 0) return;
      let damageAdded = damagePropertyWork({
        property: healthBar,
        operation: 'increment',
        value: damageLeft,
      });
      damageLeft -= damageAdded;
    });
    recomputeCreature.call({charId: creatureId});
    return totalDamage;
  },
 });
 export function adjustQuantityWork({property, operation, value}){
  // Check if property has quantity
  let schema = CreatureProperties.simpleSchema(property);
  if (!schema.allowsKey('quantity')){
    throw new Meteor.Error(
      'Adjust quantity failed',
      `Property of type "${property.type}" doesn't have a quantity`
    );
  }
  if (operation === 'set'){
    CreatureProperties.update(property._id, {
      $set: {quantity: value}
    }, {
      selector: property
    });
  } else if (operation === 'increment'){
    // value here is 'damage'
    value = -value;
    let currentQuantity = property.quantity;
    if (currentQuantity + value < 0) value = -currentQuantity;
    CreatureProperties.update(property._id, {
      $inc: {quantity: value}
    }, {
      selector: property
    });
  }
 }
 const adjustQuantity = new ValidatedMethod({
  name: 'creatureProperties.adjustQuantity',
  validate: new SimpleSchema({
    _id: SimpleSchema.RegEx.Id,
    operation: {
      type: String,
      allowedValues: ['set', 'increment']
    },
    value: Number,
  }).validator(),
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
  run({_id, operation, value}) {
 		let currentProperty = CreatureProperties.findOne(_id);
 		// Check permissions
 		assertPropertyEditPermission(currentProperty, this.userId);
    adjustQuantityWork({property: currentProperty, operation, value});
    recomputeCreatures(currentProperty);
  },
 });
 const selectAmmoItem = new ValidatedMethod({
  name: 'creatureProperties.selectAmmoItem',
  validate: new SimpleSchema({
    actionId: SimpleSchema.RegEx.Id,
    itemId: SimpleSchema.RegEx.Id,
    itemConsumedIndex: Number,
  }).validator(),
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
  run({actionId, itemId, itemConsumedIndex}) {
 		let action = CreatureProperties.findOne(actionId);
 		// Check permissions
 		assertPropertyEditPermission(action, this.userId);
    // Check that this index has a document to edit
    let itemConsumed = action.resources.itemsConsumed[itemConsumedIndex];
    if (!itemConsumed){
      throw new Meteor.Error('Resouce not found',
        'Could not set ammo, because the ammo document was not found');
    }
    let itemToLink = CreatureProperties.findOne(itemId);
    if (!itemToLink){
      throw new Meteor.Error('Item not found',
        'Could not set ammo: the item was not found');
    }
    let path = `resources.itemsConsumed.${itemConsumedIndex}.itemId`;
    CreatureProperties.update(actionId, {
      $set: {[path]: itemId}
    }, {
      selector: action,
    });
    recomputeCreatures(action);
  },
 });
 const pushToProperty = new ValidatedMethod({
 	name: 'creatureProperties.push',
 	validate: null,
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
 	run({_id, path, value}){
 		let property = CreatureProperties.findOne(_id);
    assertPropertyEditPermission(property, this.userId);
 		CreatureProperties.update(_id, {
 			$push: {[path.join('.')]: value},
 		}, {
 			selector: {type: property.type},
 		});
 		recomputeCreatures(property);
 	}
 });
 const pullFromProperty = new ValidatedMethod({
 	name: 'creatureProperties.pull',
 	validate: null,
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
 	run({_id, path, itemId}){
 		let property = CreatureProperties.findOne(_id);
    assertPropertyEditPermission(property, this.userId);
 		CreatureProperties.update(_id, {
 			$pull: {[path.join('.')]: {_id: itemId}},
 		}, {
 			selector: {type: property.type},
 			getAutoValues: false,
 		});
 		recomputeCreatures(property);
 	}
 });
 const softRemoveProperty = new ValidatedMethod({
 	name: 'creatureProperties.softRemove',
 	validate: new SimpleSchema({
 		_id: SimpleSchema.RegEx.Id
 	}).validator(),
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
 	run({_id}){
 		let property = CreatureProperties.findOne(_id);
    assertPropertyEditPermission(property, this.userId);
 		softRemove({_id, collection: CreatureProperties});
 		recomputeCreatures(property);
 	}
 });
 const restoreProperty = new ValidatedMethod({
 	name: 'creatureProperties.restore',
 	validate: new SimpleSchema({
 		_id: SimpleSchema.RegEx.Id
 	}).validator(),
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
 	run({_id}){
 		let property = CreatureProperties.findOne(_id);
    assertPropertyEditPermission(property, this.userId);
 		restore({_id, collection: CreatureProperties});
 		recomputeCreatures(property);
 	}
 });
 export default CreatureProperties;
 export {
 	CreaturePropertySchema,
 	insertProperty,
  duplicateProperty,
 	insertPropertyFromLibraryNode,
 	updateProperty,
  dealDamage,
  damagePropertiesByName,
 	damageProperty,
  adjustQuantity,
  selectAmmoItem,
 	pushToProperty,
 	pullFromProperty,
  softRemoveProperty,
 	restoreProperty,
 };
--- a/app/imports/api/creature/Creatures.js
+++ b/app/imports/api/creature/Creatures.js
@@ -1,212 +0,0 @@
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import SimpleSchema from 'simpl-schema';
 import deathSaveSchema from '/imports/api/properties/subSchemas/DeathSavesSchema.js'
 import ColorSchema from '/imports/api/properties/subSchemas/ColorSchema.js';
 import SharingSchema from '/imports/api/sharing/SharingSchema.js';
 import {assertEditPermission} from '/imports/api/sharing/sharingPermissions.js';
 import { assertUserHasPaidBenefits } from '/imports/api/users/patreon/tiers.js';
 import '/imports/api/creature/removeCreature.js';
 import '/imports/api/creature/restCreature.js';
 //set up the collection for creatures
 let Creatures = new Mongo.Collection('creatures');
 let CreatureSettingsSchema = new SimpleSchema({
 	//slowed down by carrying too much?
 	useVariantEncumbrance: {
 		type: Boolean,
 		optional: true,
 	},
 	//hide spellcasting tab
 	hideSpellcasting: {
 		type: Boolean,
 		optional: true,
 	},
 	// Swap around the modifier and stat
 	swapStatAndModifier: {
 		type: Boolean,
 		optional: true,
 	},
  // Hide all the unused stats
  hideUnusedStats: {
    type: Boolean,
    optional: true,
  },
  // How much each hitDice resets on a long rest
  hitDiceResetMultiplier: {
    type: Number,
    optional: true,
    min: 0,
    max: 1,
  },
  discordWebhook: {
    type: String,
    optional: true,
    max: 200,
  },
 });
 let CreatureSchema = new SimpleSchema({
 	// Strings
 	name: {
 		type: String,
 		defaultValue: '',
 		optional: true,
 	},
 	alignment: {
 		type: String,
 		optional: true
 	},
 	gender: {
 		type: String,
 		optional: true
 	},
 	picture: {
 		type: String,
 		optional: true
 	},
  avatarPicture: {
    type: String,
    optional: true,
  },
 	// Mechanics
 	deathSave: {
 		type: deathSaveSchema,
 		defaultValue: {},
 	},
  // 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,
 	},
  // Sum of all levels granted by milestone XP
  'denormalizedStats.milestoneLevels': {
    type: SimpleSchema.Integer,
    defaultValue: 0,
  },
  // Sum of all weights of items and containers that are carried
 	'denormalizedStats.weightCarried': {
 		type: Number,
 		defaultValue: 0,
 	},
  // Version of computation engine that was last used to compute this creature
  computeVersion: {
 		type: String,
    optional: true,
 	},
 	type: {
 		type: String,
 		defaultValue: 'pc',
 		allowedValues: ['pc', 'npc', 'monster'],
 	},
  damageMultipliers: {
    type: Object,
 		blackbox: true,
 		defaultValue: {}
  },
 	variables: {
 		type: Object,
 		blackbox: true,
 		defaultValue: {}
 	},
  // Tabletop
  tabletop: {
    type: String,
    regEx: SimpleSchema.RegEx.id,
    optional: true,
  },
  initiativeRoll: {
    type: SimpleSchema.Integer,
    optional: true,
  },
 	// Settings
 	settings: {
 		type: CreatureSettingsSchema,
 		defaultValue: {},
 	},
 });
 CreatureSchema.extend(ColorSchema);
 CreatureSchema.extend(SharingSchema);
 Creatures.attachSchema(CreatureSchema);
 const insertCreature = new ValidatedMethod({
  name: 'creatures.insertCreature',
  validate: null,
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
  run() {
    if (!this.userId) {
      throw new Meteor.Error('Creatures.methods.insert.denied',
      'You need to be logged in to insert a creature');
    }
    assertUserHasPaidBenefits(this.userId);
 		// Create the creature document
    let charId = Creatures.insert({
 			owner: this.userId,
 		});
 		this.unblock();
 		return charId;
  },
 });
 const updateCreature = new ValidatedMethod({
  name: 'creatures.update',
  validate({_id, path}){
 		if (!_id) return false;
 		// Allowed fields
 		let allowedFields = [
      'name',
      'alignment',
      'gender',
      'picture',
      'avatarPicture',
      'color',
      'settings',
    ];
 		if (!allowedFields.includes(path[0])){
 			throw new Meteor.Error('Creatures.methods.update.denied',
      'This field can\'t be updated using this method');
 		}
  },
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
  run({_id, path, value}) {
 		let creature = Creatures.findOne(_id);
    assertEditPermission(creature, this.userId);
    if (value === undefined || value === null){
      Creatures.update(_id, {
        $unset: {[path.join('.')]: 1},
      });
    } else {
      Creatures.update(_id, {
        $set: {[path.join('.')]: value},
      });
    }
  },
 });
 export default Creatures;
 export { CreatureSchema, insertCreature, updateCreature };
--- a/app/imports/api/creature/Parties.js
+++ b/app/imports/api/creature/Parties.js
@@ -1,28 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 let Parties = new Mongo.Collection('parties');
 let partySchema = new SimpleSchema({
 	name: {
 		type: String,
 		defaultValue: 'New Party',
 		trim: false,
 		optional: true,
 	},
 	creatures: {
 		type: Array,
 		defaultValue: [],
 	},
 	'creatures.$': {
 		type: String,
 		regEx: SimpleSchema.RegEx.Id,
 	},
 	owner: {
 		type: String,
 		regEx: SimpleSchema.RegEx.Id,
 	},
 });
 Parties.attachSchema(partySchema);
 export default Parties;
--- a/app/imports/api/creature/actions/applyAction.js
+++ b/app/imports/api/creature/actions/applyAction.js
@@ -1,11 +0,0 @@
 import spendResources from '/imports/api/creature/actions/spendResources.js'
 import {insertCreatureLog} from '/imports/api/creature/log/CreatureLogs.js';
 export default function applyAction({prop, creature}){
  spendResources(prop);
  insertCreatureLog.call({
    log: {
      text: prop.name,
      creatureId: creature._id},
  });
 }
--- a/app/imports/api/creature/actions/applyAdjustment.js
+++ b/app/imports/api/creature/actions/applyAdjustment.js
@@ -1,56 +0,0 @@
 import evaluateString from '/imports/api/creature/computation/afterComputation/evaluateString.js';
 import {insertCreatureLog} from '/imports/api/creature/log/CreatureLogs.js';
 import { damagePropertiesByName } from '/imports/api/creature/CreatureProperties.js';
 export default function applyAdjustment({
  prop,
  creature,
  targets,
  actionContext
 }){
  let damageTargets = prop.target === 'self' ? [creature] : targets;
  let scope = {
    ...creature.variables,
    ...actionContext,
  };
  try {
    var {result, errors} = evaluateString(prop.amount, scope, 'reduce');
    if (typeof result !== 'number') {
      return insertCreatureLog.call({ log: {
        text: errors.join(', ') || 'Something went wrong',
        creatureId: creature._id,
      }});
    }
  } catch (e){
    return insertCreatureLog.call({ log: {
      text: e.toString(),
      creatureId: creature._id,
    }});
  }
  if (damageTargets) {
    damageTargets.forEach(target => {
      if (prop.target === 'each'){
        result = evaluateString(prop.amount, scope, 'reduce');
      }
      damagePropertiesByName.call({
        creatureId: target._id,
        variableName: prop.stat,
        operation: prop.operation || 'increment',
        value: result
      });
      insertCreatureLog.call({
        log: {
          text: `${prop.stat} ${prop.operation === 'set' ? 'set to' : ''} ${-result}`,
          creatureId: target._id,
        }
      });
    });
  } else {
    insertCreatureLog.call({
      log: {
        text: `${prop.stat} ${prop.operation === 'set' ? 'set to' : ''} ${-result}`,
        creatureId: creature._id,
      }
    });
  }
 }
--- a/app/imports/api/creature/actions/applyAttack.js
+++ b/app/imports/api/creature/actions/applyAttack.js
@@ -1,18 +0,0 @@
 import roll from '/imports/parser/roll.js';
 import {insertCreatureLog} from '/imports/api/creature/log/CreatureLogs.js';
 export default function applyAttack({
  prop,
  //children,
  creature,
  //targets,
  //actionContext
 }){
  let result = roll(1, 20)[0] + prop.rollBonusResult;
  insertCreatureLog.call({
    log: {
      text: `${prop.name} attack. ${result} to hit`,
      creatureId: creature._id,
    }
  });
 }
--- a/app/imports/api/creature/actions/applyBuff.js
+++ b/app/imports/api/creature/actions/applyBuff.js
@@ -1,61 +0,0 @@
 import {
 	setLineageOfDocs,
 	renewDocIds
 } from '/imports/api/parenting/parenting.js';
 import {setDocToLastOrder} from '/imports/api/parenting/order.js';
 import CreatureProperties from '/imports/api/creature/CreatureProperties.js';
 export default function applyBuff({
  prop,
  children,
  creature,
  targets = [],
  //actionContext,
 }){
  let buffTargets = prop.target === 'self' ? [creature] : targets;
  //let scope = {
  //  ...creature.variables,
  //  ...actionContext,
  //};
  // TODO
  // If the target is not self, walk through all decendants and replace
  // variables in calculations with their values from the creature scope
  // If the target is self, replace all the target.x references with just x
  // Then copy the decendants of the buff to the targets
  prop.applied = true;
  let propList = [prop];
  function addChildrenToPropList(children){
    children.forEach(child => {
      propList.push(child.node);
      addChildrenToPropList(child.children);
    });
  }
  addChildrenToPropList(children);
  let oldParent = {
    id: prop.parent.id,
    collection: prop.parent.collection,
  };
  buffTargets.forEach(target => {
    copyNodeListToTarget(propList, target, oldParent);
  });
 }
 function copyNodeListToTarget(propList, target, oldParent){
  let ancestry = [{collection: 'creatures', id: target._id}];
  setLineageOfDocs({
    docArray: propList,
    newAncestry: ancestry,
    oldParent,
  });
  renewDocIds({
    docArray: propList,
  });
  setDocToLastOrder({
    collection: CreatureProperties,
    doc: propList[0],
  });
  CreatureProperties.batchInsert(propList);
 }
--- a/app/imports/api/creature/actions/applyDamage.js
+++ b/app/imports/api/creature/actions/applyDamage.js
@@ -1,63 +0,0 @@
 import evaluateString from '/imports/api/creature/computation/afterComputation/evaluateString.js';
 import {insertCreatureLog} from '/imports/api/creature/log/CreatureLogs.js';
 import { dealDamage } from '/imports/api/creature/CreatureProperties.js';
 export default function applyDamage({
  prop,
  creature,
  targets,
  actionContext
 }){
  let damageTargets = prop.target === 'self' ? [creature] : targets;
  let scope = {
    ...creature.variables,
    ...actionContext,
  };
  try {
    var {result, errors} = evaluateString(prop.amount, scope, 'reduce');
    if (typeof result !== 'number') {
      return insertCreatureLog.call({ log: {
        text: errors.join(', '),
        creatureId: creature._id,
      }});
    }
  } catch (e){
    return insertCreatureLog.call({ log: {
      text: e.toString(),
      creatureId: creature._id,
    }});
  }
  if (damageTargets) {
    damageTargets.forEach(target => {
      if (prop.target === 'each'){
        result = evaluateString(prop.amount, scope, 'reduce');
      }
      let damageDealt = dealDamage.call({
        creatureId: target._id,
        damageType: prop.damageType,
        amount: result,
      });
      insertCreatureLog.call({
        log: {
          text: `Recieved ${damageDealt} ${prop.damageType}${prop.damageType !== 'healing'? ' damage': ''}`,
          creatureId: target._id,
        }
      });
      if (target._id !== creature._id){
        insertCreatureLog.call({
          log: {
            text: `Dealt ${damageDealt} ${prop.damageType}${prop.damageType !== 'healing'? ' damage': ''}`,
            creatureId: creature._id,
          }
        });
      }
    });
  } else {
    insertCreatureLog.call({
      log: {
        text: `${result} ${prop.damageType}${prop.damageType !== 'healing'? ' damage': ''}`,
        creatureId: creature._id,
      }
    });
  }
 }
--- a/app/imports/api/creature/actions/applyProperties.js
+++ b/app/imports/api/creature/actions/applyProperties.js
@@ -1,67 +0,0 @@
 import applyAction from '/imports/api/creature/actions/applyAction.js';
 import applyAdjustment from '/imports/api/creature/actions/applyAdjustment.js';
 import applyAttack from '/imports/api/creature/actions/applyAttack.js';
 import applyDamage from '/imports/api/creature/actions/applyDamage.js';
 import applyBuff from '/imports/api/creature/actions/applyBuff.js';
 function applyProperty(options){
  let prop = options.prop;
  if (
    prop.disabled === true || // ignore disabled props
    prop.equipped === false || // ignore unequipped items
    prop.toggleResult === false || // ignore untoggled toggles
    prop.applied === true // ignore buffs that are already applied
  ){
    return false;
  }
  switch (prop.type){
    case 'action':
    case 'spell':
      applyAction(options);
      return true;
    case 'attack':
      applyAction(options);
      applyAttack(options);
      return true;
    case 'damage':
      applyDamage(options);
      return true;
    case 'adjustment':
      applyAdjustment(options);
      return true;
    case 'buff':
      applyBuff(options);
      return false;
    case 'roll':
      // applyRoll(options);
      return true;
    case 'savingThrow':
      // applySavingThrow(options);
      return false;
  }
 }
 export default function applyProperties({
  forest,
  creature,
  targets,
  actionContext
 }){
  forest.forEach(child => {
    let walkChildren = applyProperty({
      prop: child.node,
      children: child.children,
      creature,
      targets,
      actionContext
    });
    if (walkChildren){
      applyProperties({
        forest: child.children,
        creature,
        targets,
        actionContext
      });
    }
  });
 }
--- a/app/imports/api/creature/actions/doAction.js
+++ b/app/imports/api/creature/actions/doAction.js
@@ -1,62 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import CreatureProperties, { getCreature } from '/imports/api/creature/CreatureProperties.js';
 import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
 import { recomputeCreatureByDoc } from '/imports/api/creature/computation/recomputeCreature.js';
 import { nodesToTree } from '/imports/api/parenting/parenting.js';
 import applyProperties from '/imports/api/creature/actions/applyProperties.js';
 const doAction = new ValidatedMethod({
  name: 'creatureProperties.doAction',
  validate: new SimpleSchema({
    actionId: SimpleSchema.RegEx.Id,
    targetId: {
      type: String,
      regEx: SimpleSchema.RegEx.Id,
      optional: true,
    },
  }).validator(),
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 10,
    timeInterval: 5000,
  },
  run({actionId, targetId}) {
    let action = CreatureProperties.findOne(actionId);
 		// Check permissions
    let creature = getCreature(action);
    assertEditPermission(creature, this.userId);
    let target = undefined;
    if (targetId) {
      target = getCreature(targetId);
      assertEditPermission(target, this.userId);
    }
 		doActionWork({action, creature, target});
    // Note this only recomputes the top-level creature, not the nearest one
 		recomputeCreatureByDoc(creature);
    if (target){
      recomputeCreatureByDoc(target);
    }
  },
 });
 function doActionWork({action, creature, target}){
  let actionContext = {};
  let decendantForest = nodesToTree({
    collection: CreatureProperties,
    ancestorId: action._id,
  });
  let startingForest = [{
    node: action,
    children: decendantForest,
  }];
  applyProperties({
    forest: startingForest,
    creature,
    target,
    actionContext
  });
 }
 export default doAction;
--- a/app/imports/api/creature/actions/doCheck.js
+++ b/app/imports/api/creature/actions/doCheck.js
@@ -1,56 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import Creatures from '/imports/api/creature/Creatures.js';
 import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
 import roll from '/imports/parser/roll.js';
 const doCheck = new ValidatedMethod({
  name: 'creature.doCheck',
  validate: new SimpleSchema({
    creatureId: {
      type: String,
      regEx: SimpleSchema.RegEx.Id,
      optional: true,
    },
    attributeName: {
      type: String,
      optional: true,
    },
  }).validator(),
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 10,
    timeInterval: 5000,
  },
  run({creatureId, attributeName}) {
    let creature = Creatures.findOne(creatureId);
    assertEditPermission(creature, this.userId);
    let bonus = getAttributeValue({creature, attributeName})
 		return doCheckWork({bonus});
  },
 });
 function getAttributeValue({creature, attributeName}){
  let att = creature.variables[attributeName];
  if (!att) throw new Meteor.Error('No such attribute',
    `This creature does not have a ${attributeName} property`);
  let bonus = att.attributeType === 'ability'? att.modifier : att.value;
  return bonus || 0;
 }
 export function doCheckWork({bonus, advantage = 0}){
  let rolls = roll(2,20);
  let chosenRoll;
  if (advantage === 1){
    chosenRoll = Math.max.apply(rolls);
  } else if (advantage === -1){
    chosenRoll = Math.min.apply(rolls);
  } else {
    chosenRoll = rolls[0];
  }
  let result = chosenRoll + bonus;
  return {rolls, bonus, chosenRoll, result};
 }
 export default doCheck;
--- a/app/imports/api/creature/actions/spendResources.js
+++ b/app/imports/api/creature/actions/spendResources.js
@@ -1,57 +0,0 @@
 import CreatureProperties, { damagePropertyWork, adjustQuantityWork } from '/imports/api/creature/CreatureProperties.js';
 export default function spendResources(action){
  // Check Uses
  if (action.usesUsed >= action.usesResult){
    throw new Meteor.Error('Insufficient Uses',
      'This action has no uses left');
  }
  // Resources
  if (action.insufficientResources){
    throw new Meteor.Error('Insufficient Resources',
      'This creature doesn\'t have sufficient resources to perform this action');
  }
  // Items
  let itemQuantityAdjustments = [];
  action.resources.itemsConsumed.forEach(itemConsumed => {
    if (!itemConsumed.itemId){
      throw new Meteor.Error('Ammo not selected',
        'No ammo was selected for this action');
    }
    let item = CreatureProperties.findOne(itemConsumed.itemId);
    if (!item || item.ancestors[0].id !== action.ancestors[0].id){
      throw new Meteor.Error('Ammo not found',
        'The action\'s ammo was not found on the creature');
    }
    if (!item.equipped){
      throw new Meteor.Error('Ammo not equipped',
        'The selected ammo is not equipped');
    }
    if (!itemConsumed.quantity) return;
    itemQuantityAdjustments.push({
      property: item,
      operation: 'increment',
      value: itemConsumed.quantity,
    });
  });
  // No more errors should be thrown after this line
  // Now that we have confirmed that there are no errors, do actual work
  //Items
  itemQuantityAdjustments.forEach(adjustQuantityWork);
  // Use uses
  CreatureProperties.update(action._id, {
    $inc: {usesUsed: 1}
  }, {
    selector: action
  });
  // Damage stats
  action.resources.attributesConsumed.forEach(attConsumed => {
    if (!attConsumed.quantity) return;
    let stat = CreatureProperties.findOne(attConsumed.statId);
    damagePropertyWork({
      property: stat,
      operation: 'increment',
      value: attConsumed.quantity,
    });
  });
 }
--- a/app/imports/api/creature/computation/ComputationMemo.js
+++ b/app/imports/api/creature/computation/ComputationMemo.js
@@ -1,294 +0,0 @@
 import { includes, cloneDeep } from 'lodash';
 // The computation memo is an in-memory data structure used only during the
 // computation process
 export default class ComputationMemo {
  constructor(props, creature){
    this.statsByVariableName = {};
    this.extraStatsByVariableName = {};
    this.statsById = {};
    this.originalPropsById = {};
    this.propsById = {};
    this.skillsByAbility = {};
    this.unassignedEffects = [];
    this.classLevelsById = {};
    this.classes = {};
    this.togglesById = {};
    this.toggleIds = new Set();
    // Equipped items that might be used as ammo
    this.equipmentById = {};
    // Properties that have calculations, but don't impact other properties
    this.endStepPropsById = {};
    // First note all the ids of all the toggles
    props.forEach((prop) => {
      if (
        prop.type === 'toggle'
      ) {
        this.toggleIds.add(prop._id);
      }
    });
    props.filter((prop) => {
      if (
        prop.type === 'toggle'
      ) {
        this.addToggle(prop);
      } else {
        return true;
      }
    }).filter((prop) => {
      if (
        prop.type === 'attribute' ||
        prop.type === 'skill'
      ) {
        // Add all the stats
        this.addStat(prop);
      } else if (
        prop.type === 'item'
      ) {
        this.addEquipment(prop);
      } else {
        return true;
      }
    }).forEach((prop) => {
      // Now add all effects and proficiencies
      if (prop.type === 'effect'){
        this.addEffect(prop);
      } else if (prop.type === 'proficiency') {
        this.addProficiency(prop);
      } else if (prop.type === 'classLevel'){
        this.addClassLevel(prop);
      } else {
        this.addEndStepProp(prop);
      }
    });
    for (let name in creature.denormalizedStats){
      if (!this.statsByVariableName[name]){
        this.statsByVariableName[name] = {
          variableName: name,
          value: creature.denormalizedStats[name],
          computationDetails: propDetailsByType.denormalizedStat(),
        }
      }
    }
  }
  registerProperty(prop){
    this.originalPropsById[prop._id] = cloneDeep(prop);
    this.propsById[prop._id] = prop;
    prop.computationDetails = propDetails(prop);
    prop.ancestors.forEach(ancestor => {
      if (this.toggleIds.has(ancestor.id)){
        prop.computationDetails.toggleAncestors.push(ancestor.id);
      }
    });
    return prop;
  }
  addToggle(prop){
    prop = this.registerProperty(prop);
    this.togglesById[prop._id] = prop;
  }
  addClassLevel(prop){
    prop = this.registerProperty(prop);
    this.classLevelsById[prop._id] = prop;
  }
  addStat(prop){
    let variableName = prop.variableName;
    if (!variableName) return;
    let existingStat = this.statsByVariableName[variableName];
    if (existingStat){
      existingStat.computationDetails.idsOfSameName.push(prop._id);
      this.originalPropsById[prop._id] = cloneDeep(prop);
      if (prop.baseValueCalculation){
        existingStat.computationDetails.effects.push({
          operation: 'base',
          calculation: prop.baseValueCalculation,
          stats: [variableName],
          computationDetails: propDetailsByType.effect(),
          statBase: true,
        });
      }
      if (prop.baseProficiency){
        existingStat.computationDetails.proficiencies.push({
          value: prop.baseProficiency,
          stats: [variableName],
          computationDetails: propDetailsByType.proficiency(),
          type: 'proficiency',
          statBase: true,
        });
      }
    } else {
      prop = this.registerProperty(prop);
      this.statsById[prop._id] = prop;
      this.statsByVariableName[variableName] = prop;
      if (
        prop.type === 'skill' &&
        isSkillCheck(prop) &&
        prop.ability
      ){
        this.addSkillToAbility(prop, prop.ability)
      }
    }
  }
  addSkillToAbility(prop, ability){
    if (!this.skillsByAbility[ability]){
      this.skillsByAbility[ability] = [];
    }
    this.skillsByAbility[ability].push(prop);
  }
  addEffect(prop){
    prop = this.registerProperty(prop);
    let targets = this.getEffectTargets(prop);
    targets.forEach(target => {
      if (target.computationDetails.effects){
        target.computationDetails.effects.push(prop);
      }
    });
    if (!targets.size){
      this.unassignedEffects.push(prop);
    }
  }
  getEffectTargets(prop){
    let targets = new Set();
    if (!prop.stats) return targets;
    prop.stats.forEach((statName) => {
      let target = this.statsByVariableName[statName];
      if (!target) return;
      targets.add(target);
      if (isSkillOperation(prop) && isAbility(target)){
        let extras = this.skillsByAbility[statName] || [];
        extras.forEach(ex =>{
          // Only pass on ability effects to skills and checks
          if (ex.skillType === 'skill' || ex.skillType === 'check'){
            targets.add(ex)
          }
        });
      }
    });
    return targets;
  }
  addProficiency(prop){
    prop = this.registerProperty(prop);
    let targets = this.getProficiencyTargets(prop);
    targets.forEach(target => {
      target.computationDetails.proficiencies.push(prop);
    });
  }
  getProficiencyTargets(prop){
    let targets = new Set();
    if (!prop.stats) return targets;
    prop.stats.forEach(statName => {
      let target = this.statsByVariableName[statName];
      if (!target) return;
      targets.add(target);
      if (isAbility(target)) {
        let extras = this.skillsByAbility[statName] || [];
        extras.forEach(ex =>{
          // Only pass on ability proficiencies to skills and checks
          if (ex.skillType === 'skill' || ex.skillType === 'check'){
            targets.add(ex)
          }
        });
      }
    });
    return targets;
  }
  addEquipment(prop){
    prop = this.registerProperty(prop);
    this.equipmentById[prop._id] = prop;
  }
  addEndStepProp(prop){
    prop = this.registerProperty(prop);
    this.endStepPropsById[prop._id] = prop;
  }
 }
 function isAbility(prop){
  return prop.type === 'attribute' &&
  prop.attributeType === 'ability'
 }
 function isSkillCheck(prop){
  return includes(['skill', 'check', 'save', 'utility'], prop.skillType);
 }
 const skillOperations = [
  'advantage',
  'disadvantage',
  'passiveAdd',
  'fail',
  'conditional',
  'rollBonus',
 ];
 function isSkillOperation(prop){
  return skillOperations.includes(prop.operation);
 }
 function propDetails(prop){
  return propDetailsByType[prop.type] && propDetailsByType[prop.type]() ||
    propDetailsByType.default();
 }
 const propDetailsByType = {
  default(){
    return {
      toggleAncestors: [],
      disabledByToggle: false,
    };
  },
  toggle(){
    return {
      computed: false,
      busyComputing: false,
      toggleAncestors: [],
      disabledByToggle: false,
    };
  },
  attribute(){
    return {
      computed: false,
      busyComputing: false,
      effects: [],
      toggleAncestors: [],
      disabledByToggle: false,
      idsOfSameName: [],
    };
  },
  skill(){
    return {
      computed: false,
      busyComputing: false,
      effects: [],
      proficiencies: [],
      toggleAncestors: [],
      disabledByToggle: false,
      idsOfSameName: [],
    };
  },
  effect(){
    return {
      computed: false,
      busyComputing: false,
      toggleAncestors: [],
      disabledByToggle: false,
    };
  },
  classLevel(){
    return {
      computed: true,
      toggleAncestors: [],
      disabledByToggle: false,
    };
  },
  proficiency(){
    return {
      toggleAncestors: [],
      disabledByToggle: false,
    };
  },
  denormalizedStat(){
    return {
      toggleAncestors: [],
      disabledByToggle: false,
    };
  }
 }
--- a/app/imports/api/creature/computation/EffectAggregator.js
+++ b/app/imports/api/creature/computation/EffectAggregator.js
@@ -1,88 +0,0 @@
 import evaluateCalculation from '/imports/api/creature/computation/evaluateCalculation.js';
 export default class EffectAggregator{
  constructor(stat, memo){
    delete this.baseValueErrors;
    if (stat.baseValueCalculation){
      let {result, context} = evaluateCalculation(stat.baseValueCalculation, memo);
      this.statBaseValue = result.value;
      if (context.errors.length){
        this.baseValueErrors = context.errors;
      }
      this.base = this.statBaseValue;
    } else {
      this.base = 0;
    }
    this.add = 0;
    this.mul = 1;
    this.min = Number.NEGATIVE_INFINITY;
    this.max = Number.POSITIVE_INFINITY;
    this.advantage = 0;
    this.disadvantage = 0;
    this.passiveAdd = 0;
    this.fail = 0;
    this.set = undefined;
    this.conditional = [];
    this.rollBonus = [];
    this.hasNoEffects = true;
  }
  addEffect(effect){
    let result = effect.result;
    if (this.hasNoEffects) this.hasNoEffects = false;
    switch(effect.operation){
      case 'base':
        // Take the largest base value
        this.base = result > this.base ? result : this.base;
        if (effect.statBase){
          if (this.statBaseValue === undefined || result > this.statBaseValue){
            this.statBaseValue = result;
          }
        }
        break;
      case 'add':
        // Add all adds together
        this.add += result;
        break;
      case 'mul':
        // Multiply the muls together
        this.mul *= result;
        break;
      case 'min':
        // Take the largest min value
        this.min = result > this.min ? result : this.min;
        break;
      case 'max':
        // Take the smallest max value
        this.max = result < this.max ? result : this.max;
        break;
      case 'set':
        // Take the highest set value
        this.set = this.set === undefined || result > this.set ? result : this.set;
        break;
      case 'advantage':
        // Sum number of advantages
        this.advantage++;
        break;
      case 'disadvantage':
        // Sum number of disadvantages
        this.disadvantage++;
        break;
      case 'passiveAdd':
        // Add all passive adds together
        this.passiveAdd += result;
        break;
      case 'fail':
        // Sum number of fails
        this.fail++;
        break;
      case 'conditional':
        // Store array of conditionals
        this.conditional.push(result);
        break;
      case 'rollBonus':
        // Store array of roll bonuses
        this.rollBonus.push(result);
        break;
    }
  }
 }
--- a/app/imports/api/creature/computation/afterComputation/evaluateString.js
+++ b/app/imports/api/creature/computation/afterComputation/evaluateString.js
@@ -1,29 +0,0 @@
 import { parse, CompilationContext } from '/imports/parser/parser.js';
 import ConstantNode from '/imports/parser/parseTree/ConstantNode.js';
 export default function evaluateString(string, scope, fn = 'compile'){
  let errors = [];
  if (!string){
    errors.push('No string provided');
    return {result: string, errors};
  }
  if (!scope) errors.push('No scope provided');
  // Parse the string using mathjs
  let node;
  try {
    node = parse(string);
  } catch (e) {
    errors.push(e);
    return {result: string, errors};
  }
  let context = new CompilationContext();
  let result = node[fn](scope, context);
  if (result instanceof ConstantNode){
    return {result: result.value, errors: context.errors}
  } else {
    return {result: result.toString(), errors: context.errors};
  }
 }
--- a/app/imports/api/creature/computation/afterComputation/evalutateStringWithEmbeddedCalculations.js
+++ b/app/imports/api/creature/computation/afterComputation/evalutateStringWithEmbeddedCalculations.js
@@ -1,11 +0,0 @@
 import evaluateString from '/imports/api/creature/computation/afterComputation/evaluateString.js';
 // Strings can have computations in bracers like so: {computation}
 export default function evalutateStringWithEmbeddedCalculations(string, scope){
 	if (!string) return string;
  // Compute everything inside bracers
 	return string.replace(/\{([^{}]*)\}/g, function(match, p1){
    let {result} = evaluateString(p1, scope);
    return result;
 	});
 }
--- a/app/imports/api/creature/computation/applyToggles.js
+++ b/app/imports/api/creature/computation/applyToggles.js
@@ -1,11 +0,0 @@
 import computeToggle from '/imports/api/creature/computation/computeToggle.js';
 export default function applyToggles(prop, memo){
  prop.computationDetails.toggleAncestors.forEach(toggleId => {
    let toggle = memo.togglesById[toggleId];
    computeToggle(toggle, memo);
    if (!toggle.toggleResult){
      prop.computationDetails.disabledByToggle = true;
    }
  });
 }
--- a/app/imports/api/creature/computation/combineStat.js
+++ b/app/imports/api/creature/computation/combineStat.js
@@ -1,131 +0,0 @@
 import computeStat from '/imports/api/creature/computation/computeStat.js';
 import applyToggles from '/imports/api/creature/computation/applyToggles.js';
 import evaluateCalculation from '/imports/api/creature/computation/evaluateCalculation.js';
 export default function combineStat(stat, aggregator, memo){
  if (stat.type === 'attribute'){
    combineAttribute(stat, aggregator, memo);
  } else if (stat.type === 'skill'){
    combineSkill(stat, aggregator, memo);
  } else if (stat.type === 'damageMultiplier'){
    combineDamageMultiplier(stat, memo);
  }
 }
 function getAggregatorResult(stat, aggregator){
  let result = (aggregator.base + aggregator.add) * aggregator.mul;
  if (result < aggregator.min) {
    result = aggregator.min;
  }
  if (result > aggregator.max) {
    result = aggregator.max;
  }
  if (aggregator.set !== undefined) {
    result = aggregator.set;
  }
  if (!stat.decimal && Number.isFinite(result)){
    result = Math.floor(result);
  }
  return result;
 }
 function combineAttribute(stat, aggregator, memo){
  stat.value = getAggregatorResult(stat, aggregator);
  stat.baseValue = aggregator.statBaseValue;
  stat.baseValueErrors = aggregator.baseValueErrors;
  if (stat.attributeType === 'spellSlot'){
    let {result, context} = evaluateCalculation(stat.spellSlotLevelCalculation, memo);
    stat.spellSlotLevelValue = result.value;
    stat.spellSlotLevelErrors = context.errors;
  }
  stat.currentValue = stat.value - (stat.damage || 0);
  if (stat.attributeType === 'ability') {
    stat.modifier = Math.floor((stat.currentValue - 10) / 2);
  }
  stat.hide = aggregator.hasNoEffects &&
    stat.baseValue === undefined ||
    undefined
 }
 function combineSkill(stat, aggregator, memo){
  // Skills are based on some ability Modifier
  let ability = memo.statsByVariableName[stat.ability]
  if (stat.ability && ability){
    if (!ability.computationDetails.computed){
      computeStat(ability, memo);
    }
    stat.abilityMod = ability.modifier;
  }
  // Combine all the child proficiencies
  stat.proficiency = stat.baseProficiency || 0;
  for (let i in stat.computationDetails.proficiencies){
    let prof = stat.computationDetails.proficiencies[i];
    applyToggles(prof, memo);
    if (
      !prof.computationDetails.disabledByToggle &&
      prof.value > stat.proficiency
    ){
      stat.proficiency = prof.value;
    }
  }
  // Get the character's proficiency bonus to apply
  let profBonusStat = memo.statsByVariableName['proficiencyBonus'];
  let profBonus = profBonusStat && profBonusStat.value;
  if (typeof profBonus !== 'number' && memo.statsByVariableName['level']){
    let level = memo.statsByVariableName['level'].value;
    profBonus = Math.ceil(level / 4) + 1;
  }
  // Multiply the proficiency bonus by the actual proficiency
  profBonus *= stat.proficiency;
  // Base value
  stat.baseValue = aggregator.statBaseValue;
  stat.baseValueErrors = aggregator.baseValueErrors;
  // Combine everything to get the final result
  let result = (aggregator.base + stat.abilityMod + profBonus + aggregator.add) * aggregator.mul;
  if (result < aggregator.min) result = aggregator.min;
  if (result > aggregator.max) result = aggregator.max;
  if (aggregator.set !== undefined) {
    result = aggregator.set;
  }
  if (Number.isFinite(result)){
    result = Math.floor(result);
  }
  stat.value = result;
  // Advantage/disadvantage
  if (aggregator.advantage && !aggregator.disadvantage){
    stat.advantage = 1;
  } else if (aggregator.disadvantage && !aggregator.advantage){
    stat.advantage = -1;
  } else {
    stat.advantage = 0;
  }
  // Passive bonus
  stat.passiveBonus = aggregator.passiveAdd;
  // conditional benefits
  stat.conditionalBenefits = aggregator.conditional;
  // Roll bonuses
  stat.rollBonus = aggregator.rollBonus;
  // Forced to fail
  stat.fail = aggregator.fail;
  // Rollbonus
  stat.rollBonuses = aggregator.rollBonus;
  // Hide
  stat.hide = aggregator.hasNoEffects &&
    stat.baseValue === undefined &&
    stat.proficiency == 0 ||
    undefined;
 }
 function combineDamageMultiplier(stat){
  if (stat.immunityCount) return 0;
  let result;
  if (stat.ressistanceCount && !stat.vulnerabilityCount){
    result = 0.5;
  }  else if (!stat.ressistanceCount && stat.vulnerabilityCount){
    result = 2;
  } else {
    result = 1;
  }
  stat.value = result;
 }
--- a/app/imports/api/creature/computation/computeEffect.js
+++ b/app/imports/api/creature/computation/computeEffect.js
@@ -1,45 +0,0 @@
 import evaluateCalculation from '/imports/api/creature/computation/evaluateCalculation.js';
 import applyToggles from '/imports/api/creature/computation/applyToggles.js';
 export default function computeEffect(effect, memo){
  if (effect.computationDetails.computed) return;
  if (effect.computationDetails.busyComputing){
    // Trying to compute this effect again while it is already computing.
    // We must be in a dependency loop.
    effect.computationDetails.computed = true;
    effect.result = NaN;
    effect.computationDetails.busyComputing = false;
    effect.computationDetails.error = 'dependencyLoop';
    if (Meteor.isClient) console.warn('dependencyLoop', effect);
    return;
  }
  // Before doing any work, mark this effect as busy
  effect.computationDetails.busyComputing = true;
  // Apply any toggles
  applyToggles(effect, memo);
  // Determine result of effect calculation
  delete effect.errors;
  if (!effect.calculation){
    if(effect.operation === 'add' || effect.operation === 'base'){
      effect.result = 0;
    } else {
      delete effect.result
    }
  } else if (Number.isFinite(+effect.calculation)){
    effect.result = +effect.calculation;
  } else if(effect.operation === 'conditional' || effect.operation === 'rollBonus'){
    effect.result = effect.calculation;
  } else if(_.contains(['advantage', 'disadvantage', 'fail'], effect.operation)){
    effect.result = 1;
  } else {
    let {result, context} = evaluateCalculation(effect.calculation, memo);
    effect.result = result.value;
    if (context.errors.length){
      effect.errors = context.errors;
    }
  }
  effect.computationDetails.computed = true;
  effect.computationDetails.busyComputing = false;
 }
--- a/app/imports/api/creature/computation/computeEndStepProperty.js
+++ b/app/imports/api/creature/computation/computeEndStepProperty.js
@@ -1,94 +0,0 @@
 import evaluateCalculation from '/imports/api/creature/computation/evaluateCalculation.js';
 export default function computeEndStepProperty(prop, memo){
  switch (prop.type){
    case 'action':
    case 'spell':
      computeAction(prop, memo);
      break;
    case 'attack':
      computeAction(prop, memo);
      computeAttack(prop, memo);
      break;
    case 'savingThrow':
      computeSavingThrow(prop, memo);
      break;
    case 'spellList':
      computeSpellList(prop, memo);
      break;
    case 'propertySlot':
      computeSlot(prop, memo);
  }
 }
 function computeAction(prop, memo){
  // Uses
  let {result, context} = evaluateCalculation(prop.uses, memo);
  prop.usesResult = result.value;
  if (context.errors.length){
    prop.usesErrors = context.errors;
  } else {
    delete prop.usesErrors;
  }
  prop.insufficientResources = undefined;
  if (prop.usesUsed >= prop.usesResult){
    prop.insufficientResources = true;
  }
  if (!prop.resources) return;
  // Attributes consumed
  prop.resources.attributesConsumed.forEach((attConsumed, i) => {
    if (attConsumed.variableName){
      let stat = memo.statsByVariableName[attConsumed.variableName];
      prop.resources.attributesConsumed[i].statId = stat && stat._id;
      prop.resources.attributesConsumed[i].statName = stat && stat.name;
      let available = stat && stat.currentValue || 0;
      prop.resources.attributesConsumed[i].available = available;
      if (available < attConsumed.quantity){
        prop.insufficientResources = true;
      }
    }
  });
  // Items consumed
  prop.resources.itemsConsumed.forEach((itemConsumed, i) => {
    let item = itemConsumed.itemId && memo.equipmentById[itemConsumed.itemId];
    prop.resources.itemsConsumed[i].itemId = item && item._id;
    let available = item && item.quantity || 0;
    prop.resources.itemsConsumed[i].available = available;
    let name = item && item.name;
    if (item && item.quantity !== 1 && item.plural){
      name = item.plural;
    }
    prop.resources.itemsConsumed[i].itemName = name;
    prop.resources.itemsConsumed[i].itemIcon = item && item.icon;
    prop.resources.itemsConsumed[i].itemColor = item && item.color;
    if (!item || available < itemConsumed.quantity){
      prop.insufficientResources = true;
    }
  });
 }
 function computePropertyField(prop, memo, fieldName, fn){
  let {result, context} = evaluateCalculation(prop[fieldName], memo, fn);
  prop[`${fieldName}Result`] = result.value;
  if (context.errors.length){
    prop[`${fieldName}Errors`] = context.errors;
  } else {
    delete prop[`${fieldName}Errors`];
  }
 }
 function computeAttack(prop, memo){
  computePropertyField(prop, memo, 'rollBonus');
 }
 function computeSavingThrow(prop, memo){
  computePropertyField(prop, memo, 'dc');
 }
 function computeSpellList(prop, memo){
  computePropertyField(prop, memo, 'maxPrepared');
 }
 function computeSlot(prop, memo){
  computePropertyField(prop, memo, 'slotCondition');
 }
--- a/app/imports/api/creature/computation/computeLevels.js
+++ b/app/imports/api/creature/computation/computeLevels.js
@@ -1,44 +0,0 @@
 import { forOwn, has } from 'lodash';
 export default function computeLevels(memo){
  computeClassLevels(memo);
  computeTotalLevel(memo);
 }
 function computeClassLevels(memo){
  forOwn(memo.classLevelsById, classLevel => {
    let name = classLevel.variableName;
    let stat = memo.statsByVariableName[name];
    if (!stat){
      memo.statsByVariableName[name] = classLevel;
      memo.classes[name] = classLevel;
    } else if (!has(stat, 'level')){
      // Stat is overriden by an attribute
      return;
    } else if (stat.level < classLevel.level) {
      memo.statsByVariableName[name] = classLevel;
      memo.classes[name] = classLevel;
    }
  });
 }
 function computeTotalLevel(memo){
  let currentLevel = memo.statsByVariableName['level'];
  if (!currentLevel){
    currentLevel = {
      value: 0,
      computationDetails: {
        builtIn: true,
        computed: true,
      }
    };
    memo.statsByVariableName['level'] = currentLevel;
  }
  // bail out if overriden by an attribute
  if (!currentLevel.computationDetails.builtIn) return;
  let level = 0;
  for (let name in memo.classes){
    level += memo.classes[name].level || 0;
  }
  memo.statsByVariableName['level'].value = level;
 }
--- a/app/imports/api/creature/computation/computeMemo.js
+++ b/app/imports/api/creature/computation/computeMemo.js
@@ -1,27 +0,0 @@
 import { each, forOwn } from 'lodash';
 import computeLevels from '/imports/api/creature/computation/computeLevels.js';
 import computeStat from '/imports/api/creature/computation/computeStat.js';
 import computeEffect from '/imports/api/creature/computation/computeEffect.js';
 import computeToggle from '/imports/api/creature/computation/computeToggle.js';
 import computeEndStepProperty from '/imports/api/creature/computation/computeEndStepProperty.js';
 export default function computeMemo(memo){
  // Compute level
  computeLevels(memo);
  // Compute all stats, even if they are overriden
  forOwn(memo.statsById, stat => {
    computeStat (stat, memo);
  });
  // Compute effects which didn't end up targeting a stat
  each(memo.unassignedEffects, effect => {
    computeEffect(effect, memo);
  });
  // Compute toggles which didn't already get computed by dependencies
  forOwn(memo.togglesById, toggle => {
    computeToggle(toggle, memo);
  });
  // Compute end step properties
  forOwn(memo.endStepPropsById, prop => {
    computeEndStepProperty(prop, memo);
  });
 }
--- a/app/imports/api/creature/computation/computeStat.js
+++ b/app/imports/api/creature/computation/computeStat.js
@@ -1,40 +0,0 @@
 import combineStat from '/imports/api/creature/computation/combineStat.js';
 import computeEffect from '/imports/api/creature/computation/computeEffect.js';
 import EffectAggregator from '/imports/api/creature/computation/EffectAggregator.js';
 import applyToggles from '/imports/api/creature/computation/applyToggles.js';
 import { each } from 'lodash';
 export default function computeStat(stat, memo){
  // If the stat is already computed, skip it
  if (stat.computationDetails.computed) return;
  if (stat.computationDetails.busyComputing){
    // Trying to compute this stat again while it is already computing.
    // We must be in a dependency loop.
    stat.computationDetails.computed = true;
    stat.value = NaN;
    stat.computationDetails.busyComputing = false;
    stat.computationDetails.error = 'dependencyLoop';
    if (Meteor.isClient) console.warn('dependencyLoop', stat);
    return;
  }
  // Before doing any work, mark this stat as busy
  stat.computationDetails.busyComputing = true;
  // Apply any toggles
  applyToggles(stat, memo);
  if (!stat.computationDetails.disabledByToggle){
    // Compute and aggregate all the effects
    let aggregator = new EffectAggregator(stat, memo)
    each(stat.computationDetails.effects, (effect) => {
      computeEffect(effect, memo);
      if (!effect.computationDetails.disabledByToggle){
        aggregator.addEffect(effect);
      }
    });
    // Conglomerate all the effects to compute the final stat values
    combineStat(stat, aggregator, memo);
  }
  // Mark the attribute as computed
  stat.computationDetails.computed = true;
  stat.computationDetails.busyComputing = false;
 }
--- a/app/imports/api/creature/computation/computeToggle.js
+++ b/app/imports/api/creature/computation/computeToggle.js
@@ -1,37 +0,0 @@
 import evaluateCalculation from '/imports/api/creature/computation/evaluateCalculation.js';
 export default function computeToggle(toggle, memo){
  if (toggle.computationDetails.computed) return;
  if (toggle.computationDetails.busyComputing){
    // Trying to compute this effect again while it is already computing.
    // We must be in a dependency loop.
    toggle.computationDetails.computed = true;
    toggle.result = false;
    toggle.computationDetails.busyComputing = false;
    toggle.computationDetails.error = 'dependencyLoop';
    if (Meteor.isClient) console.warn('dependencyLoop', toggle);
    return;
  }
  // Before doing any work, mark this toggle as busy
  toggle.computationDetails.busyComputing = true;
  // Do work
  delete toggle.errors;
  if (toggle.enabled){
    toggle.toggleResult = true;
  } else if (toggle.disabled){
    toggle.toggleResult = false;
  } else if (!toggle.condition){
    toggle.toggleResult = false;
  } else if (Number.isFinite(+toggle.condition)){
    toggle.toggleResult = !!+toggle.condition;
  } else {
    let {result, context} = evaluateCalculation(toggle.condition, memo);
    toggle.toggleResult = !!result.value;
    if (context.errors.length){
      toggle.errors = context.errors;
    }
  }
  toggle.computationDetails.computed = true;
  toggle.computationDetails.busyComputing = false;
 }
--- a/app/imports/api/creature/computation/evaluateCalculation.js
+++ b/app/imports/api/creature/computation/evaluateCalculation.js
@@ -1,41 +0,0 @@
 import computeStat from '/imports/api/creature/computation/computeStat.js';
 import { parse, CompilationContext } from '/imports/parser/parser.js';
 import SymbolNode from '/imports/parser/parseTree/SymbolNode.js';
 import AccessorNode from '/imports/parser/parseTree/AccessorNode.js';
 import ConstantNode from '/imports/parser/parseTree/ConstantNode.js';
 /* Convert a calculation into a constant output and errors*/
 export default function evaluateCalculation(string, memo, fn = 'reduce'){
  if (!string) return {
    context: {errors: []},
    result: new ConstantNode({value: string, type: 'string'}),
  };
  let errors = [];
  // Parse the string
  let calc;
  try {
    calc = parse(string);
  } catch (e) {
    errors.push({
      type: 'parsing',
      message: e.message || e
    });
    return {
      context: {errors},
      result: new ConstantNode({value: string, type: 'string'}),
    };
  }
  // Ensure all symbol nodes are defined and coputed
  calc.traverse(node => {
    if (node instanceof SymbolNode || node instanceof AccessorNode){
      let stat = memo.statsByVariableName[node.name];
      if (stat && !stat.computationDetails.computed){
        computeStat(stat, memo);
      }
    }
  });
  // Evaluate
  let context = new CompilationContext();
  let result = calc[fn](memo.statsByVariableName, context);
  return {result, context};
 }
--- a/app/imports/api/creature/computation/recomputeCreature.js
+++ b/app/imports/api/creature/computation/recomputeCreature.js
@@ -1,138 +0,0 @@
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import SimpleSchema from 'simpl-schema';
 import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
 import ComputationMemo from '/imports/api/creature/computation/ComputationMemo.js';
 import CreatureProperties from '/imports/api/creature/CreatureProperties.js';
 import computeMemo from '/imports/api/creature/computation/computeMemo.js';
 import writeAlteredProperties from '/imports/api/creature/computation/writeAlteredProperties.js';
 import writeCreatureVariables from '/imports/api/creature/computation/writeCreatureVariables.js';
 import { recomputeDamageMultipliersById } from '/imports/api/creature/denormalise/recomputeDamageMultipliers.js';
 import recomputeInactiveProperties from '/imports/api/creature/denormalise/recomputeInactiveProperties.js';
 import recomputeSlotFullness from '/imports/api/creature/denormalise/recomputeSlotFullness.js';
 import Creatures from '/imports/api/creature/Creatures.js';
 export const recomputeCreature = new ValidatedMethod({
  name: 'creatures.recomputeCreature',
  validate: new SimpleSchema({
    charId: { type: String }
  }).validator(),
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
  run({charId}) {
    let creature = Creatures.findOne(charId);
    // Permission
    assertEditPermission(creature, this.userId);
    // Work, call this direcly if you are already in a method that has checked
    // for permission to edit a given character
    recomputeCreatureById(charId);
  },
 });
 const calculationPropertyTypes = [
  'attribute',
  'skill',
  'effect',
  'proficiency',
  'classLevel',
  'toggle',
  'item',
  // End step types
  'action',
  'attack',
  'savingThrow',
  'spellList',
  'spell',
  'propertySlot',
 ];
 export function recomputeCreatureById(creatureId){
  let creature = Creatures.findOne(creatureId);
  recomputeCreatureByDoc(creature);
 }
 /**
 * This function is the heart of DiceCloud. It recomputes a creature's stats,
 * distilling down effects and proficiencies into the final stats that make up
 * a creature.
 *
 * Essentially this is a depth first tree traversal algorithm that computes
 * stats' dependencies before computing stats themselves, while detecting
 * dependency loops.
 *
 * At the moment it makes no effort to limit recomputation to just what was
 * changed.
 *
 * Attempting to implement dependency management to limit recomputation to just
 * change affected stats should only happen as a last resort, when this function
 * can no longer be performed more efficiently, and server resources can not be
 * expanded to meet demand.
 *
 * A brief overview:
 * - Fetch the stats of the creature and add them to
 *   an object for quick lookup
 * - Fetch the effects and proficiencies which apply to each stat and store them with the stat
 * - Fetch the class levels and store them as well
 * - Mark each stat and effect as uncomputed
 * - Iterate over each stat in order and compute it
 *   - If the stat is already computed, skip it
 *   - If the stat is busy being computed, we are in a dependency loop, make it NaN and mark computed
 *   - Mark the stat as busy computing
 *   - Iterate over each effect which applies to the attribute
 *     - If the effect is not computed compute it
 *       - If the effect relies on another attribute, get its computed value
 *       - Recurse if that attribute is uncomputed
 *     - apply the effect to the attribute
 *   - Conglomerate all the effects to compute the final stat values
 *   - Mark the stat as computed
 * - Write the computed results back to the database
 */
 export function recomputeCreatureByDoc(creature){
  const creatureId = creature._id;
  // find all toggles that have conditions, even if they are inactive
  let toggleIds = CreatureProperties.find({
    'ancestors.id': creatureId,
    type: 'toggle',
    removed: {$ne: true},
    condition: { $exists: true },
  }, {
    fields: {_id: 1},
  }).map(t => t._id);
  // Find all the active properties
  let props = CreatureProperties.find({
    'ancestors.id': creatureId,
    removed: {$ne: true},
    type: {$in: calculationPropertyTypes},
    $or: [
      {inactive: {$ne: true}},
      // But also the inactive computed toggles and their decendants
      {'ancestors.id': {$in: toggleIds}},
      {_id: {$in: toggleIds}},
    ]
  }, {
    fields: { // Filter out potentially large fields
      icon: 0,
      summary: 0,
      description: 0,
    },
    sort: {
      order: 1,
    }
  }).fetch();
  let computationMemo = new ComputationMemo(props, creature);
  recomputeInactiveProperties(creatureId);
  computeMemo(computationMemo);
  writeAlteredProperties(computationMemo);
  writeCreatureVariables(computationMemo, creatureId);
  recomputeDamageMultipliersById(creatureId);
  recomputeSlotFullness(creatureId);
  return computationMemo;
 }
--- a/app/imports/api/creature/computation/writeAlteredProperties.js
+++ b/app/imports/api/creature/computation/writeAlteredProperties.js
@@ -1,129 +0,0 @@
 import { Meteor } from 'meteor/meteor'
 import { isEqual, forOwn } from 'lodash';
 import CreatureProperties from '/imports/api/creature/CreatureProperties.js';
 // Schemas
 // Calculated props
 import { ComputedOnlySkillSchema } from '/imports/api/properties/Skills.js';
 import { ComputedOnlyAttributeSchema } from '/imports/api/properties/Attributes.js';
 import { ComputedOnlyEffectSchema } from '/imports/api/properties/Effects.js';
 import { ComputedOnlyToggleSchema } from '/imports/api/properties/Toggles.js';
 // End step props
 import { ComputedOnlyActionSchema } from '/imports/api/properties/Actions.js';
 import { ComputedOnlyAttackSchema } from '/imports/api/properties/Attacks.js';
 import { ComputedOnlySavingThrowSchema } from '/imports/api/properties/SavingThrows.js';
 import { ComputedOnlySpellListSchema } from '/imports/api/properties/SpellLists.js';
 import { ComputedOnlySpellSchema } from '/imports/api/properties/Spells.js';
 import { ComputedOnlySlotSchema } from '/imports/api/properties/Slots.js';
 const schemasByType = {
  'skill': ComputedOnlySkillSchema,
  'attribute': ComputedOnlyAttributeSchema,
  'effect': ComputedOnlyEffectSchema,
  'toggle': ComputedOnlyToggleSchema,
  'action': ComputedOnlyActionSchema,
  'attack': ComputedOnlyAttackSchema,
  'savingThrow': ComputedOnlySavingThrowSchema,
  'spellList': ComputedOnlySpellListSchema,
  'spell': ComputedOnlySpellSchema,
  'propertySlot': ComputedOnlySlotSchema,
 };
 export default function writeAlteredProperties(memo){
  let bulkWriteOperations = [];
  // Loop through all properties on the memo
  forOwn(memo.propsById, changed => {
    let schema = schemasByType[changed.type];
    if (!schema) return;
    let extraIds = changed.computationDetails.idsOfSameName;
    let ids;
    if (extraIds && extraIds.length){
      ids = [changed._id, ...extraIds];
    } else {
      ids = [changed._id];
    }
    ids.forEach(id => {
      let op = undefined;
      let original = memo.originalPropsById[id];
      op = addChangedKeysToOp(op, schema.objectKeys(), original, changed);
      if (op){
        bulkWriteOperations.push(op);
      }
    });
  });
  bulkWriteProperties(bulkWriteOperations);
 }
 function addChangedKeysToOp(op, keys, original, changed) {
  // Loop through all keys that can be changed by computation
  // and compile an operation that sets all those keys
  for (let key of keys){
    if (!isEqual(original[key], changed[key])){
      if (!op) op = newOperation(original._id, changed.type);
      let value = changed[key];
      if (value === undefined){
        // Unset values that become undefined
        addUnsetOp(op, key);
      } else {
        // Set values that changed to something else
        addSetOp(op, key, value);
      }
    }
  }
  return op;
 }
 function newOperation(_id, type){
  let newOp = {
    updateOne: {
      filter: {_id},
      update: {},
    }
  };
  if (Meteor.isClient){
    newOp.type = type;
  }
  return newOp;
 }
 function addSetOp(op, key, value){
  if (op.updateOne.update.$set){
    op.updateOne.update.$set[key] = value;
  } else {
    op.updateOne.update.$set = {[key]: value};
  }
 }
 function addUnsetOp(op, key){
  if (op.updateOne.update.$unset){
    op.updateOne.update.$unset[key] = 1;
  } else {
    op.updateOne.update.$unset = {[key]: 1};
  }
 }
 function bulkWriteProperties(bulkWriteOps){
  if (!bulkWriteOps.length) return;
  if (Meteor.isServer){
    CreatureProperties.rawCollection().bulkWrite(
      bulkWriteOps,
      {ordered : false},
      function(e){
        if (e) {
          console.error('Bulk write failed: ');
          console.error(e);
        }
      }
    );
  } else {
    bulkWriteOps.forEach(op => {
      let updateOneOrMany = op.updateOne || op.updateMany;
      CreatureProperties.update(updateOneOrMany.filter, updateOneOrMany.update, {
        // The server code is bypassing collection 2 validation, so do the same
        // on the client
        // include this if bypass is off:
        // selector: {type: op.type}
        bypassCollection2: true,
      });
    });
  }
 }
--- a/app/imports/api/creature/computation/writeCreatureVariables.js
+++ b/app/imports/api/creature/computation/writeCreatureVariables.js
@@ -1,39 +0,0 @@
 import { pick, forOwn } from 'lodash';
 import Creatures from '/imports/api/creature/Creatures.js';
 import VERSION from '/imports/constants/VERSION.js';
 export default function writeCreatureVariables(memo, creatureId) {
  const fields = [
    'name',
    'attributeType',
    'baseValue',
    'damage',
    'decimal',
    'reset',
    'resetMultiplier',
    'value',
    'currentValue',
    'modifier',
    'ability',
    'skillType',
    'baseProficiency',
    'abilityMod',
    'advantage',
    'passiveBonus',
    'proficiency',
    'conditionalBenefits',
    'rollBonuses',
    'fail',
    'level',
  ];
  memo.creatureVariables = {};
  forOwn(memo.statsByVariableName, (stat, variableName) => {
    let condensedStat = pick(stat, fields);
    memo.creatureVariables[variableName] = condensedStat;
  });
  Creatures.update(creatureId, {$set: {
    variables: memo.creatureVariables,
    computeVersion: VERSION,
  }});
 }
--- a/app/imports/api/creature/creatureComputation.test.js
+++ b/app/imports/api/creature/creatureComputation.test.js
@@ -1,97 +0,0 @@
 import {computeCreature} from "./recomputeCreature.js";
 import assert from "assert";
 const makeEffect = function(operation, value){
  let effect = {computed: false, result: 0, operation}
  if (_.isFinite(value)){
    effect.value = +value;
  } else {
    effect.calculation = value;
  }
  return effect;
 }
 describe('computeCreature', function () {
  it('computes an aritrary creature', function () {
    let char = {
      atts: {
        attribute1: {
          computed: false,
          busyComputing: false,
          type: "attribute",
          attributeType: "ability",
          result: 0,
          mod: 0, // The resulting modifier if this is an ability
          base: 0,
          add: 0,
          mul: 1,
          min: Number.NEGATIVE_INFINITY,
          max: Number.POSITIVE_INFINITY,
          effects: [
            makeEffect("base", 10),
            makeEffect("add", 5),
            makeEffect("mul", 2),
          ],
        },
        attribute2: {
          computed: false,
          busyComputing: false,
          type: "attribute",
          result: 0,
          mod: 0, // The resulting modifier if this is an ability
          base: 0,
          add: 0,
          mul: 1,
          min: Number.NEGATIVE_INFINITY,
          max: Number.POSITIVE_INFINITY,
          effects: [
            makeEffect("base", "attribute1"),
            makeEffect("max", 2),
          ],
        },
      },
      skills: {
        skill1: {
          computed: false,
          busyComputing: false,
          type: "skill",
          ability: "attribute1",
          result: 0,
          proficiency: 0,
          add: 0,
          mul: 1,
          min: Number.NEGATIVE_INFINITY,
          max: Number.POSITIVE_INFINITY,
          advantage: 0,
          disadvantage: 0,
          passiveAdd: 0,
          fail: 0,
          conditional: 0,
          effects: [],
          proficiencies: [],
        },
      },
      dms: {
        dm1: {
          computed: false,
          busyComputing: false,
          type: "damageMultiplier",
          result: 0,
          immunityCount: 0,
          ressistanceCount: 0,
          vulnerabilityCount: 0,
          effects: [],
        }
      },
      classes: {
        Barbarian: {
          level: 5,
        },
      },
      level: 5,
    };
    char = computeCreature(char);
    console.log(char);
    assert(true);
  });
 });
--- a/app/imports/api/creature/creaturePermissions.js
+++ b/app/imports/api/creature/creaturePermissions.js
@@ -1,29 +0,0 @@
 import Creatures from '/imports/api/creature/Creatures.js';
 import {
  assertEditPermission as editPermission,
  assertViewPermission as viewPermission,
  assertOwnership as ownership
 } from '/imports/api/sharing/sharingPermissions.js';
 function getCreature(creature, fields){
  if (typeof creature === 'string'){
    return Creatures.findOne(creature, {fields});
  } else {
    return creature;
  }
 }
 export function assertOwnership(creature, userId){
  creature = getCreature(creature, {owner: 1});
  ownership(creature, userId);
 }
 export function assertEditPermission(creature, userId) {
  creature = getCreature(creature, {owner: 1, writers: 1});
  editPermission(creature, userId);
 }
 export function assertViewPermission(creature, userId) {
  creature = getCreature(creature, {owner: 1, readers:1, writers: 1, public: 1});
  viewPermission(creature, userId);
 }
--- a/app/imports/api/creature/creatureProperties/assertPropertyEditPermission.js
+++ b/app/imports/api/creature/creatureProperties/assertPropertyEditPermission.js
@@ -1,7 +0,0 @@
 import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
 import getClosestPropertyAncestorCreature from '/imports/api/creature/creatureProperties/getClosestPropertyAncestorCreature.js';
 export default function assertPropertyEditPermission(prop, userId){
  let creature = getClosestPropertyAncestorCreature(prop);
  assertEditPermission(creature, userId);
 }
--- a/app/imports/api/creature/creatureProperties/getClosestPropertyAncestorCreature.js
+++ b/app/imports/api/creature/creatureProperties/getClosestPropertyAncestorCreature.js
@@ -1,7 +0,0 @@
 import Creatures from '/imports/api/creature/Creatures.js';
 import getClosestPropertyAncestorCreatureId from '/imports/api/creature/creatureProperties/getClosestPropertyAncestorCreatureId.js';
 export default function getClosestPropertyAncestorCreature(prop){
  let creatureId = getClosestPropertyAncestorCreatureId(prop);
  return Creatures.findOne(creatureId);
 }
--- a/app/imports/api/creature/creatureProperties/getClosestPropertyAncestorCreatureId.js
+++ b/app/imports/api/creature/creatureProperties/getClosestPropertyAncestorCreatureId.js
@@ -1,13 +0,0 @@
 export default function getClosestPropertyAncestorCreatureId(prop){
  if (!prop.ancestors) throw 'Property has no ancestors';
  let creatureId;
  // Find the last ancestor in the creature collection
  for (let i = prop.ancestors.length - 1; i >= 0; i--){
    if (prop.ancestors[i].collection === 'creatures'){
      creatureId = prop.ancestors[i].id;
      break;
    }
  }
  if (!creatureId) throw 'This property has no creature ancestors';
  return creatureId;
 }
--- a/app/imports/api/creature/creatureProperties/manageEquipment.js
+++ b/app/imports/api/creature/creatureProperties/manageEquipment.js
@@ -1,64 +0,0 @@
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import CreatureProperties from '/imports/api/creature/CreatureProperties.js';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
 import { organizeDoc } from '/imports/api/parenting/organizeMethods.js';
 import getClosestPropertyAncestorCreature from '/imports/api/creature/creatureProperties/getClosestPropertyAncestorCreature.js';
 import INVENTORY_TAGS from '/imports/constants/INVENTORY_TAGS.js';
 function getParentRefByTag(creatureId, tag){
  let prop = CreatureProperties.findOne({
    'ancestors.id': creatureId,
    removed: {$ne: true},
    inactive: {$ne: true},
    tags: tag,
  }, {
    sort: {order: 1},
  });
  if (prop){
    return {id: prop._id, collection: 'creatureProperties'};
  } else {
    return {id: creatureId, collection: 'creatures'};
  }
 }
 // Equipping or unequipping an item will also change its parent
 const equipItem = new ValidatedMethod({
  name: 'creatureProperties.equip',
  validate({_id, equipped}){
 		if (!_id) throw new Meteor.Error('No _id', '_id is required');
    if (equipped !== true && equipped !== false) {
      throw new Meteor.Error('No equipped', 'equipped is required to be true or false');
    }
  },
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
  run({_id, equipped}) {
    let item = CreatureProperties.findOne(_id);
    if (item.type !== 'item') throw new Meteor.Error('wrong type',
    'Equip and unequip can only be performed on items');
    let creature = getClosestPropertyAncestorCreature(item);
    assertEditPermission(creature, this.userId);
    CreatureProperties.update(_id, {
      $set: {equipped},
    }, {
 			selector: {type: 'item'},
 		});
    let tag = equipped ? INVENTORY_TAGS.equipment : INVENTORY_TAGS.carried;
    let parentRef = getParentRefByTag(creature._id, tag);
    // organizeDoc handles recompuation
    organizeDoc.call({
      docRef: {
        id: _id,
        collection: 'creatureProperties',
      },
      parentRef,
      order: Number.MAX_SAFE_INTEGER,
    });
  },
 });
 export { equipItem, getParentRefByTag }
--- a/app/imports/api/creature/denormalise/recomputeDamageMultipliers.js
+++ b/app/imports/api/creature/denormalise/recomputeDamageMultipliers.js
@@ -1,74 +0,0 @@
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import SimpleSchema from 'simpl-schema';
 import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
 import Creatures from '/imports/api/creature/Creatures.js';
 import getActiveProperties from '/imports/api/creature/getActiveProperties.js';
 export const recomputeDamageMultipliers = new ValidatedMethod({
  name: 'creatures.recomputeDamageMultipliers',
  validate: new SimpleSchema({
    creatureId: { type: String }
  }).validator(),
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
  run({creatureId}) {
    // Permission
    assertEditPermission(creatureId, this.userId);
    // Work, call this direcly if you are already in a method that has checked
    // for permission to edit a given character
    recomputeDamageMultipliersById(creatureId);
  },
 });
 export function recomputeDamageMultipliersById(creatureId){
  if (!creatureId) throw 'Creature ID is required';
  let props = getActiveProperties({
    ancestorId: creatureId,
    filter: {type: 'damageMultiplier'},
  });
  // Count of how many weakness, resistances and immunities each damage type has
  let multipliersByName = {};
  props.forEach(dm => {
    dm.damageTypes.forEach(damageType => {
      if (!multipliersByName[damageType]){
        multipliersByName[damageType] = {
          weaknesses: 0,
          resistances: 0,
          immunities: 0,
        };
      }
      if (dm.value === 0){
        multipliersByName[damageType].immunities++;
      } else if (dm.value === 0.5){
        multipliersByName[damageType].resistances++;
      } else if (dm.value === 2){
        multipliersByName[damageType].weaknesses++;
      }
    });
  });
  // Make an Object with keys of all the damage types that have a resulting
  // immunity, weakness, or resistance
  let damageMultipliers = {};
  for (let damageType in multipliersByName){
    let multiplier = multipliersByName[damageType];
    if (multiplier.immunities){
      damageMultipliers[damageType] = 0;
    } else if (multiplier.resistances && !multiplier.weaknesses){
      damageMultipliers[damageType] = 0.5;
    } else if (multiplier.weaknesses && !multiplier.resistances){
      damageMultipliers[damageType] = 2;
    }
  }
  // Store the Object on the creature document
  Creatures.update(creatureId, {$set: {damageMultipliers}});
 }
--- a/app/imports/api/creature/denormalise/recomputeInactiveProperties.js
+++ b/app/imports/api/creature/denormalise/recomputeInactiveProperties.js
@@ -1,59 +0,0 @@
 import CreatureProperties from '/imports/api/creature/CreatureProperties.js';
 export default function recomputeInactiveProperties(ancestorId){
  let disabledFilter = {
    'ancestors.id': ancestorId,
    $or: [
      {disabled: true}, // Everything can be disabled
      {type: 'buff', applied: false}, // Buffs can be applied
      {type: 'item', equipped: {$ne: true}},
      {type: 'toggle', toggleResult: false},
      {type: 'spell', prepared: {$ne: true}, alwaysPrepared: {$ne: true}},
    ],
  };
  let disabledIds = CreatureProperties.find(disabledFilter, {
    fields: {_id: 1},
  }).map(prop => prop._id);
  // Deactivate relevant properties
  // Inactive properties
  CreatureProperties.update({
    'ancestors.id': ancestorId,
    '_id': {$in: disabledIds},
    $or: [{inactive: {$ne: true}}, {deactivatedByAncestor: true}],
  }, {
    $set: {inactive: true},
    $unset: {deactivatedByAncestor: 1},
  }, {
    multi: true,
    selector: {type: 'any'},
  });
  // Decendants of inactive properties
  CreatureProperties.update({
    'ancestors.id': {$eq: ancestorId, $in: disabledIds},
    $or: [{inactive: {$ne: true}}, {deactivatedByAncestor: {$ne: true}}],
  }, {
    $set: {
      inactive: true,
      deactivatedByAncestor: true,
    },
  }, {
    multi: true,
    selector: {type: 'any'},
  });
  // Remove inactive from all the properties that are inactive but shouldn't be
  CreatureProperties.update({
    'ancestors.id': {$eq: ancestorId, $nin: disabledIds},
    '_id': {$nin: disabledIds},
    $or: [{inactive: true}, {deactivatedByAncestor: true}],
  }, {
    $unset: {
      inactive: 1,
      deactivatedByAncestor: 1,
    },
  }, {
    multi: true,
    selector: {type: 'any'},
  });
 }
--- a/app/imports/api/creature/denormalise/recomputeSlotFullness.js
+++ b/app/imports/api/creature/denormalise/recomputeSlotFullness.js
@@ -1,39 +0,0 @@
 import CreatureProperties from '/imports/api/creature/CreatureProperties.js';
 // n + 1 database queries + n potential updates for n slots. Could be sped up.
 export default function recomputeSlotFullness(ancestorId){
  CreatureProperties.find({
    'ancestors.id': ancestorId,
    type: 'propertySlot',
  }).forEach(slot => {
    let children = CreatureProperties.find({
      'parent.id': slot._id,
      removed: {$ne: true},
    }, {
      fields: {
        slotQuantityFilled: 1,
        type: 1
      }
    }).fetch();
    let totalFilled = 0;
    children.forEach(child => {
      if (child.type === 'slotFiller'){
        totalFilled += child.slotQuantityFilled;
      } else {
        totalFilled++;
      }
    });
    let spaceLeft;
    if (slot.quantityExpected === 0){
      spaceLeft = null;
    } else {
      spaceLeft = slot.quantityExpected - totalFilled;
    }
    if (slot.totalFilled !== totalFilled || slot.spaceLeft !== spaceLeft){
      CreatureProperties.update(slot._id, {
        $set: {totalFilled, spaceLeft},
      }, {
        selector: {type: 'propertySlot'}
      });
    }
  });
 }
--- a/app/imports/api/creature/experience/Experiences.js
+++ b/app/imports/api/creature/experience/Experiences.js
@@ -1,197 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import { getUserTier } from '/imports/api/users/patreon/tiers.js';
 import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
 import Creatures from '/imports/api/creature/Creatures.js';
 import { recomputeCreatureById } from '/imports/api/creature/computation/recomputeCreature.js';
 let Experiences = new Mongo.Collection('experiences');
 let ExperienceSchema = new SimpleSchema({
 	name: {
 		type: String,
 		optional: true,
 	},
 	// The amount of XP this experience gives
 	xp: {
 		type: SimpleSchema.Integer,
 		optional: true,
    min: 0,
 	},
  // Setting levels instead of value grants whole levels
  levels: {
    type: SimpleSchema.Integer,
    optional: true,
    min: 0,
    index: 1,
  },
 	// The real-world date that it occured, usually sorted by date
 	date: {
 		type: Date,
 		autoValue: function() {
 			// If the date isn't set, set it to now
 			if (!this.isSet) {
 				return new Date();
 			}
 		},
    index: 1,
 	},
  creatureId: {
    type: String,
    regEx: SimpleSchema.RegEx.Id,
    index: 1,
  },
 });
 Experiences.attachSchema(ExperienceSchema);
 const insertExperienceForCreature = function({experience, creatureId, userId}){
  assertEditPermission(creatureId, userId);
  if (experience.xp){
    Creatures.update(creatureId, {$inc: {
      'denormalizedStats.xp': experience.xp
    }});
  }
  if (experience.levels) {
    Creatures.update(creatureId, {$inc: {
      'denormalizedStats.milestoneLevels': experience.levels
    }});
  }
  experience.creatureId = creatureId;
  let id = Experiences.insert(experience);
  recomputeCreatureById(creatureId);
  return id;
 };
 const insertExperience = new ValidatedMethod({
  name: 'experiences.insert',
  validate: new SimpleSchema({
    experience: {
      type: ExperienceSchema.omit('creatureId'),
    },
    creatureIds: {
      type: Array,
      max: 12,
    },
    'creatureIds.$': {
      type: String,
      regEx: SimpleSchema.RegEx.Id,
    },
  }).validator(),
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
  run({experience, creatureIds}) {
    let userId = this.userId;
    if (!userId) {
      throw new Meteor.Error('Experiences.methods.insert.denied',
      'You need to be logged in to insert an experience');
    }
    let tier = getUserTier(this.userId);
    if (!tier.paidBenefits){
      throw new Meteor.Error('Experiences.methods.insert.denied',
      `The ${tier.name} tier does not allow you to grant experience`);
    }
    let insertedIds = [];
    creatureIds.forEach(creatureId => {
      let id = insertExperienceForCreature({experience, creatureId, userId});
      insertedIds.push(id);
    });
    return insertedIds;
  },
 });
 const removeExperience = new ValidatedMethod({
  name: 'experiences.remove',
  validate: new SimpleSchema({
    experienceId: {
      type: String,
      regEx: SimpleSchema.RegEx.Id,
    },
  }).validator(),
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
  run({experienceId}) {
    let userId = this.userId;
    if (!userId) {
      throw new Meteor.Error('Experiences.methods.remove.denied',
      'You need to be logged in to remove an experience');
    }
    let tier = getUserTier(this.userId);
    if (!tier.paidBenefits){
      throw new Meteor.Error('Experiences.methods.remove.denied',
      `The ${tier.name} tier does not allow you to remove  an experience`);
    }
    let experience = Experiences.findOne(experienceId);
    if (!experience) return;
    let creatureId = experience.creatureId
    assertEditPermission(creatureId, userId);
    if (experience.xp){
      Creatures.update(creatureId, {$inc: {
        'denormalizedStats.xp': -experience.xp
      }});
    }
    if (experience.levels) {
      Creatures.update(creatureId, {$inc: {
        'denormalizedStats.milestoneLevels': -experience.levels
      }});
    }
    experience.creatureId = creatureId;
    let numRemoved = Experiences.remove(experienceId);
    recomputeCreatureById(creatureId);
    return numRemoved;
  },
 });
 const recomputeExperiences = new ValidatedMethod({
  name: 'experiences.recompute',
  validate: new SimpleSchema({
    creatureId: {
      type: String,
      regEx: SimpleSchema.RegEx.Id,
    },
  }).validator(),
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
  run({creatureId}) {
    let userId = this.userId;
    if (!userId) {
      throw new Meteor.Error('Experiences.methods.recompute.denied',
      'You need to be logged in to recompute a creature\'s experiences');
    }
    let tier = getUserTier(this.userId);
    if (!tier.paidBenefits){
      throw new Meteor.Error('Experiences.methods.recompute.denied',
      `The ${tier.name} tier does not allow you to recompute a creature's experiences`);
    }
    assertEditPermission(creatureId, userId);
    let xp = 0;
    let milestoneLevels = 0;
    Experiences.find({
      creatureId
    }, {
      fields: {xp: 1, levels: 1}
    }).forEach(experience => {
      xp += experience.xp || 0;
      milestoneLevels += experience.levels || 0;
    });
    Creatures.update(creatureId, {$set: {
      'denormalizedStats.xp': xp,
      'denormalizedStats.milestoneLevels': milestoneLevels
    }});
    recomputeCreatureById(creatureId);
  },
 });
 export default Experiences;
 export { ExperienceSchema, insertExperience, removeExperience, recomputeExperiences };
--- a/app/imports/api/creature/getActiveProperties.js
+++ b/app/imports/api/creature/getActiveProperties.js
@@ -1,86 +0,0 @@
 import Creatures from '/imports/api/creature/Creatures.js';
 import CreatureProperties from '/imports/api/creature/CreatureProperties.js';
 export default function getActiveProperties({
  ancestorId,
  filter = {},
  options = {sort: {order: 1}},
  includeUntoggled = false,
  includeUnprepared = false,
  includeUnequipped = false,
  excludeAncestors,
 }){
  filter = getActivePropertyFilter({
    ancestorId,
    filter,
    includeUntoggled,
    includeUnprepared,
    includeUnequipped,
    excludeAncestors,
  });
  return CreatureProperties.find(filter, options).fetch();
 }
 export function getActivePropertyFilter({
  ancestorId,
  filter = {},
  includeUntoggled = false,
  includeUnprepared = false,
  includeUnequipped = false,
  excludeAncestors = [],
 }){
  if (!ancestorId){
    throw 'Ancestor Id is required to get active properties'
  }
  // First get ids of disabled properties, unequiped items, unapplied buffs
  let disabledAncestorsFilter = {
    'ancestors.id': ancestorId,
    $or: [
      {disabled: true}, // Everything can be disabled
      {applied: false}, // Buffs can be applied
    ],
  };
  if (!includeUnequipped){
    disabledAncestorsFilter.$or.push({type: 'item', equipped: {$ne: true}});
  }
  if (!includeUntoggled){
    disabledAncestorsFilter.$or.push({toggleResult: false});
  }
  if (!includeUnprepared){
    disabledAncestorsFilter.$or.push({
      type: 'spell',
      prepared: {$ne: true},
      alwaysPrepared: {$ne: true}
    });
  }
  let disabledAncestorIds = CreatureProperties.find(disabledAncestorsFilter, {
    fields: {_id: 1},
  }).map(prop => prop._id);
  // Then get the ids of creatures that are children of this creature
  // to isolate their decendent properties
  Creatures.find({
    'ancestors.id': ancestorId,
  }, {
    fields: {_id: 1},
  }).forEach(subCreature => {
    disabledAncestorIds.push(subCreature._id);
  });
  // Get all the properties that are decendents of the ancestor of interest but
  // aren't from the excluded decendents
  if (filter['ancestors.id'] && Meteor.isClient){
    console.warn('Filtering on ancestor id is ignored')
  }
  filter['ancestors.id'] = {
    $eq: ancestorId,
    $nin: disabledAncestorIds.concat(excludeAncestors),
  };
  // Get properties that aren't removed
  filter.removed = {$ne: true};
  // Don't include the disabled ancestors themselves either
  filter._id = {
    $nin: disabledAncestorIds,
  }
  return filter;
 }
--- a/app/imports/api/creature/journal/JournalEntry.js
+++ b/app/imports/api/creature/journal/JournalEntry.js
@@ -1,44 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 let ExperienceSchema = new SimpleSchema({
 	title: {
 		type: String,
 		optional: true,
 	},
 	// Potentially long description of the event
 	description: {
 		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,
 	},
  // Tags to better find this entry later
  tags: {
    type: Array,
    defaultValue: [],
  },
  'tags.$': {
    type: String,
  },
  // ID of the journal this entry belongs to
  journalId: {
    type: String,
    regEx: SimpleSchema.RegEx.Id,
    index: 1,
  }
 });
 export { ExperienceSchema };
--- a/app/imports/api/creature/log/CreatureLogs.js
+++ b/app/imports/api/creature/log/CreatureLogs.js
@@ -1,176 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 import Creatures from '/imports/api/creature/Creatures.js';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import {assertEditPermission} from '/imports/api/creature/creaturePermissions.js';
 import { parse, CompilationContext } from '/imports/parser/parser.js';
 const PER_CREATURE_LOG_LIMIT = 100;
 if (Meteor.isServer){
  var sendWebhookAsCreature = require('/imports/server/discord/sendWebhook.js').sendWebhookAsCreature;
 }
 let CreatureLogs = new Mongo.Collection('creatureLogs');
 let CreatureLogSchema = new SimpleSchema({
 	text: {
 		type: String,
 	},
  type: {
    type: String,
    allowedValues: ['roll', 'change', 'damage', 'info'],
    defaultValue: 'info',
  },
 	// The real-world date that it occured, usually sorted by date
 	date: {
 		type: Date,
 		autoValue: function() {
 			// If the date isn't set, set it to now
 			if (!this.isSet) {
 				return new Date();
 			}
 		},
    index: 1,
 	},
  creatureId: {
    type: String,
    regEx: SimpleSchema.RegEx.Id,
    index: 1,
  },
 });
 CreatureLogs.attachSchema(CreatureLogSchema);
 function removeOldLogs(creatureId){
  // Find the first log that is over the limit
  let firstExpiredLog = CreatureLogs.find({
    creatureId
  }, {
    sort: {date: -1},
    skip: PER_CREATURE_LOG_LIMIT,
  });
  // Remove all logs older than the one over the limit
  CreatureLogs.remove({
    creatureId,
    date: {$lte: firstExpiredLog.date},
  });
 }
 function logWebhook({log, creature}){
  if (Meteor.isServer){
    sendWebhookAsCreature({
      creature,
      content: log.text,
    });
  }
 }
 const insertCreatureLog = new ValidatedMethod({
  name: 'creatureLogs.methods.insertCreatureLog',
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
 	validate: new SimpleSchema({
 		log: CreatureLogSchema.omit('type', 'date'),
 	}).validator(),
  run({log}){
    const creatureId = log.creatureId;
    const creature = Creatures.findOne(creatureId, {fields: {
      readers: 1,
      writers: 1,
      owner: 1,
      'settings.discordWebhook': 1,
      name: 1,
      avatarPicture: 1,
    }});
    assertEditPermission(creature, this.userId);
    // Build the new log
    if (typeof log === 'string'){
      log = {text: log};
    }
    log.date = new Date();
    // Insert it
    let id = CreatureLogs.insert(log);
    if (Meteor.isServer){
      this.unblock();
      removeOldLogs(creatureId);
      logWebhook({log, creature});
    }
    return id;
  },
 });
 function equalIgnoringWhitespace(a, b){
  if (typeof a !== 'string' || typeof b !== 'string') return a === b;
  return a.replace(/\s/g,'') === b.replace(/\s/g, '');
 }
 const logRoll = new ValidatedMethod({
  name: 'creatureLogs.methods.logForCreature',
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
 	validate: new SimpleSchema({
 		roll: {
 			type: String,
 		},
 		creatureId: {
 			type: String,
 			regEx: SimpleSchema.RegEx.Id,
 		},
 	}).validator(),
  run({roll, creatureId}){
    const creature = Creatures.findOne(creatureId, {fields: {
      variables: 1,
      readers: 1,
      writers: 1,
      owner: 1,
      'settings.discordWebhook': 1,
      name: 1,
      avatarPicture: 1,
    }});
    assertEditPermission(creature, this.userId);
    let parsedResult = parse(roll);
    let logText;
    if (parsedResult === null) {
      logText = 'Unexpected end of input';
    }
    else try {
      logText = [];
      let rollContext = new CompilationContext();
      let compiled = parsedResult.compile(creature.variables, rollContext);
      let compiledString = compiled.toString();
      if (!equalIgnoringWhitespace(compiledString, roll)) logText.push(roll);
      logText.push(compiledString);
      let rolled = compiled.roll(creature.variables, rollContext);
      let rolledString = rolled.toString();
      if (rolledString !== compiledString) logText.push(rolled.toString());
      let result = rolled.reduce(creature.variables, rollContext);
      let resultString = result.toString();
      if (resultString !== rolledString) logText.push(resultString);
      logText = logText.join('\n\n');
    } catch (e){
      logText = 'Calculation error';
    }
    const log = {
      text: logText,
      creatureId,
      date: new Date(),
    };
    let id = CreatureLogs.insert(log);
    if (Meteor.isServer){
      this.unblock();
      removeOldLogs(creatureId);
      logWebhook({log, creature});
    }
    return id;
  },
 });
 export default CreatureLogs;
 export { CreatureLogSchema, insertCreatureLog, logRoll};
--- a/app/imports/api/creature/mixins/creaturePermissionMixin.js
+++ b/app/imports/api/creature/mixins/creaturePermissionMixin.js
@@ -1,52 +0,0 @@
 import {
  assertEditPermission,
  assertViewPermission,
  assertOwnership,
 } from '/imports/api/creature/creaturePermissions.js';
 // Checks if the method has permission to run on the document. If the document
 // has a charId, that creature is checked, otherwise if it has an _id and the
 // collection is defined in the method options, that document is fetched to
 // determine its charId, otherwise a getCharId method can be defined to perform
 // a special search for the required creature
 //
 // Because this mixin injects the charId into argument objects that don't
 // already contain it, it should always come last in the mixin list, so that it
 // the outermost wrapper of the run function
 export default function creaturePermissionMixin(methodOptions){
  let assertPermission;
  if (methodOptions.permission === 'owner'){
    assertPermission = assertOwnership;
  } else if (methodOptions.permission === 'edit'){
    assertPermission = assertEditPermission;
  } else if (methodOptions.permission === 'view'){
    assertPermission = assertViewPermission;
  } else {
    throw "`permission` missing in method options";
  }
  let getCharId;
  if (methodOptions.getCharId){
    getCharId = methodOptions.getCharId;
  } else if (methodOptions.collection) {
    getCharId = function({_id}){
      return methodOptions.collection.findOne(_id, {
        fields: {charId: 1}
      }).charId;
    };
  } else {
    getCharId = function(){
      throw "`getCharId` or `collection` missing in method options," +
      " or {charId} missing in call";
    };
  }
  let runFunc = methodOptions.run;
  methodOptions.run = function(doc, ...rest){
    // Store the charId on the doc for other mixins if it had to be fetched
    doc.charId = doc.charId || getCharId.apply(this, arguments);
    assertPermission(doc.charId, this.userId);
    return runFunc.call(this, doc, ...rest);
  };
  return methodOptions;
 }
--- a/app/imports/api/creature/mixins/propagateInheritanceUpdateMixin.js
+++ b/app/imports/api/creature/mixins/propagateInheritanceUpdateMixin.js
@@ -1,59 +0,0 @@
 import {
  updateChildren,
  updateDescendants,
 } from '/imports/api/parenting/parenting.js';
 import { inheritedFields } from '/imports/api/parenting/ChildSchema.js';
 import MONGO_OPERATORS from '/imports/constants/MONGO_OPERATORS.js';
 // This mixin can be safely applied to all update methods which are validated
 // with the updateSchemaMixin. It will propagate updates to fields which
 // are inherited and normalised on the parent or ancestor docs
 // It should have neglible performance impact for updates that aren't inherited
 function propagateInheritanceUpdate({_id, update}){
  let childModifier = {};
  let descendantModifier = {};
  // For each operator
  for (let operator of MONGO_OPERATORS){
    // If the operator is in the update, for each field
    if (update[operator]) for (let field in update[operator]){
      // Get the top level field that was actually modified
      const indexOfDot = field.indexOf('.');
      let modifiedField;
      if (indexOfDot !== -1) {
        modifiedField = field.substring(0, indexOfDot);
      } else {
        modifiedField = field;
      }
      // If that field is updated and inherited
      if (inheritedFields.has(modifiedField)){
        // Perform the same update on the descendants
        if (!childModifier[operator]) childModifier[operator] = {};
        if (!descendantModifier[operator]) descendantModifier[operator] = {};
        childModifier[operator][`parent.${field}`] = update[operator][field];
        descendantModifier[operator][`ancestors.$.${field}`] = update[operator][field];
      }
    }
  }
  // Update the parent object of its children
  updateChildren({
    parentId: _id,
    modifier: childModifier,
  });
  // Update the ancestors object of its descendants
  updateDescendants({
    ancestorId: _id,
    modifier: descendantModifier,
  });
 }
 export default function propagateInheritanceUpdateMixin(methodOptions){
  let runFunc = methodOptions.run;
  methodOptions.run = function({_id, update}){
    const result = runFunc.apply(this, arguments);
    propagateInheritanceUpdate({_id, update});
    return result;
  };
  return methodOptions;
 }
--- a/app/imports/api/creature/mixins/recomputeCreatureMixin.js
+++ b/app/imports/api/creature/mixins/recomputeCreatureMixin.js
@@ -1,17 +0,0 @@
 import { recomputeCreatureById } from '/imports/api/creature/computation/recomputeCreature.js';
 export default function recomputeCreatureMixin(methodOptions){
  let runFunc = methodOptions.run;
  methodOptions.run = function({charId}){
    const result = runFunc.apply(this, arguments);
    if (
      methodOptions.skipRecompute &&
      methodOptions.skipRecompute.apply(this, arguments)
    ) {
      return result;
    }
    recomputeCreatureById(charId);
    return result;
  };
  return methodOptions;
 }
--- a/app/imports/api/creature/mixins/setDocToLastMixin.js
+++ b/app/imports/api/creature/mixins/setDocToLastMixin.js
@@ -1,27 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 import { setDocToLastOrder } from '/imports/api/parenting/order.js';
 export function setDocToLastMixin(methodOptions){
  // Make sure the doc has a charId
  // This mixin should come before simpleSchemaMixin so that it can extend the
  // schema before it is turned into a validate function
  if (methodOptions.validate){
    throw new Meteor.Error(`setDocToLastMixin should come before simpleSchemaMixin`);
  }
  methodOptions.schema = new SimpleSchema({
    charId: {
      type: String,
      regEx: SimpleSchema.RegEx.Id,
    },
  }).extend(methodOptions.schema);
  let collection = methodOptions.collection;
  if (!collection){
    throw new Meteor.Error("`collection` required in method options for setDocToLastMixin");
  }
  let runFunc = methodOptions.run;
  methodOptions.run = function(doc){
    setDocToLastOrder({collection, doc});
    return runFunc.apply(this, arguments);
  };
  return methodOptions;
 }
--- a/app/imports/api/creature/mixins/simpleSchemaMixin.js
+++ b/app/imports/api/creature/mixins/simpleSchemaMixin.js
@@ -1,51 +0,0 @@
 // Copied from https://github.com/sethjgore/meteor-simple-schema-mixin
 // and updated to simpl-schema npm package
 import SimpleSchema from 'simpl-schema';
 export default function simpleSchemaMixin(methodOptions) {
  // If the user didn't give us a schema and they did give us a validate, assume
  // that they are choosing to use the validate way of doing things in this call.
  //  If they've built a wrapper around ValidateMethod that includes this mixin
  // all the time, this could happen semi-"intentionally". There may be times they
  // just don't want to use a schema and have specified a "validate" option. So
  // returning the unchanged options instead of an error seems proper.
  if ((typeof methodOptions.schema === 'undefined'
      && typeof methodOptions.validate !== 'undefined')
    || (typeof methodOptions.schema !== 'undefined' && methodOptions.schema === null
      && typeof methodOptions.validate !== 'undefined' && methodOptions.validate !== null)) {
    return methodOptions;
  }
  // If they truly gave us both... that just doesn't seem proper.
  if (methodOptions.validate && methodOptions.validate !== null) {
    throw new Meteor.Error(
      'simpleSchemaMixin.options',
      '"schema" and "validate" options cannot be used together');
  }
  // Note that setting them both null will make it through, defaulting to the
  // schema = null behavior (enforce no args) instead of the validate = null
  // behavior (do no validation).
  const newOptions = methodOptions;
  newOptions.schemaValidatorOptions =
    newOptions.schemaValidatorOptions ||
    { clean: true, filter: false };
  let simpleSchema;
  if (!newOptions.schema || newOptions.schema === null) {
    // Allow simply leaving off both the schema and validate specifications
    // or setting them to "null" as a shorthand. In this case, unlike
    // the straight default validate or typical coder's call to validator,
    // we will ENFORCE the Method be called without parameters because of
    // the "filter: false" above.
    simpleSchema = new SimpleSchema({});
  } else if (newOptions.schema instanceof SimpleSchema) {
    // In this one case, we can save ourselves the time to make a schema out
    // of the schema.
    simpleSchema = newOptions.schema;
  } else {
    simpleSchema = new SimpleSchema(newOptions.schema);
  }
  newOptions.validate = simpleSchema.validator(newOptions.schemaValidatorOptions);
  return newOptions;
 };
--- a/app/imports/api/creature/mixins/updateSchemaMixin.js
+++ b/app/imports/api/creature/mixins/updateSchemaMixin.js
@@ -1,67 +0,0 @@
 const argumentSchema = new SimpleSchema({
  _id: SimpleSchema.RegEx.Id,
  update: {
    type: Object,
    blackbox: true,
  },
 });
 // Modified simpleSchemaMixin
 import SimpleSchema from 'simpl-schema';
 export default function updateSchemaMixin(methodOptions) {
  // If the user didn't give us a schema and they did give us a validate, assume
  // that they are choosing to use the validate way of doing things in this call.
  if ((
    typeof methodOptions.schema === 'undefined' &&
    typeof methodOptions.validate !== 'undefined'
  ) || (
    typeof methodOptions.schema !== 'undefined' &&
    methodOptions.schema === null &&
    typeof methodOptions.validate !== 'undefined' &&
    methodOptions.validate !== null
  )) {
    return methodOptions;
  }
  // If they truly gave us both... that just doesn't seem proper.
  if (methodOptions.validate && methodOptions.validate !== null) {
    throw new Meteor.Error(
      'simpleSchemaMixin.options',
      '"schema" and "validate" options cannot be used together');
  }
  // Note that setting them both null will make it through, defaulting to the
  // schema = null behavior (enforce no args) instead of the validate = null
  // behavior (do no validation).
  // Apply default validator options if none are provided
  methodOptions.schemaValidatorOptions =
    methodOptions.schemaValidatorOptions ||
    { clean: true, modifier: true };
  // Make the update schema a SimpleSchema, if it isn't already
  let updateSchema;
  if (methodOptions.schema instanceof SimpleSchema) {
    updateSchema = methodOptions.schema;
  } else {
    updateSchema = new SimpleSchema(methodOptions.schema);
  }
  // Set up the new validation
  methodOptions.validate = function(args){
    argumentSchema.validate(args);
    updateSchema.validate(
      {$set: args.update},
      methodOptions.schemaValidatorOptions
    );
  };
  // Give a default run function if one isn't supplied
  if (!methodOptions.run){
    methodOptions.run = function({_id, update}){
      return methodOptions.collection.update(_id, {$set: update});
    };
  }
  return methodOptions;
 }
--- a/app/imports/api/creature/removeCreature.js
+++ b/app/imports/api/creature/removeCreature.js
@@ -1,37 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import { assertOwnership } from '/imports/api/creature/creaturePermissions.js';
 import Creatures from '/imports/api/creature/Creatures.js';
 import CreatureProperties from '/imports/api/creature/CreatureProperties.js';
 import CreatureLogs from '/imports/api/creature/log/CreatureLogs.js';
 import Experiences from '/imports/api/creature/experience/Experiences.js';
 function removeRelatedDocuments(creatureId){
  CreatureProperties.remove({'ancestors.id': creatureId});
  CreatureLogs.remove({creatureId});
  Experiences.remove({creatureId});
 }
 const removeCreature = new ValidatedMethod({
  name: 'Creatures.methods.removeCreature', // DDP method name
  validate: new SimpleSchema({
    charId: {
      type: String,
      regEx: SimpleSchema.RegEx.Id,
    },
  }).validator(),
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
  run({charId}) {
    assertOwnership(charId, this.userId)
    Creatures.remove(charId);
 		this.unblock();
 		removeRelatedDocuments(charId);
  },
 });
 export default removeCreature;
--- a/app/imports/api/creature/restCreature.js
+++ b/app/imports/api/creature/restCreature.js
@@ -1,112 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import Creatures from '/imports/api/creature/Creatures.js';
 import CreatureProperties from '/imports/api/creature/CreatureProperties.js';
 import getActiveProperties, { getActivePropertyFilter } from '/imports/api/creature/getActiveProperties.js';
 import { assertEditPermission } from '/imports/api/creature/creaturePermissions.js';
 import { recomputeCreatureById } from '/imports/api/creature/computation/recomputeCreature.js';
 const restCreature = new ValidatedMethod({
  name: 'creature.methods.longRest',
  validate: new SimpleSchema({
    creatureId: {
      type: String,
      regEx: SimpleSchema.RegEx.Id,
    },
    restType: {
      type: String,
      allowedValues: ['shortRest', 'longRest'],
    },
  }).validator(),
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
  run({creatureId, restType}) {
    let creature = Creatures.findOne(creatureId, {
      fields: {
        owner: 1,
        writers: 1,
        settings: 1,
      }
    }) ;
    // Need edit permissions
    assertEditPermission(creature, this.userId);
    // Long rests reset short rest properties as well
    let resetFilter;
    if (restType === 'shortRest'){
      resetFilter = 'shortRest'
    } else {
      resetFilter = {$in: ['shortRest', 'longRest']}
    }
    // Only apply to active properties
    let filter = getActivePropertyFilter({
      filter: {reset: resetFilter},
      ancestorId: creatureId,
      includeUntoggled: true,
    });
    // update all attribute's damage
    filter.type = 'attribute';
    CreatureProperties.update(filter, {
      $set: {damage: 0}
    }, {
      selector: {type: 'attribute'},
      multi: true,
    });
    // Update all action-like properties' usesUsed
    filter.type = {$in: [
      'action',
      'attack',
      'spell'
    ]};
    CreatureProperties.update(filter, {
      $set: {usesUsed: 0}
    }, {
      selector: {type: 'action'},
      multi: true,
    });
    // Reset half hit dice on a long rest, starting with the highest dice
    if (restType === 'longRest'){
      let hitDice = getActiveProperties({
        ancestorId: creatureId,
        filter: {type: 'attribute', attributeType: 'hitDice'},
        options: {fields: {
          hitDiceSize: 1,
          damage: 1,
          value: 1,
        }},
      });
      // Use a collator to do sorting in natural order
      let collator = new Intl.Collator('en', {
        numeric: true, sensitivity: 'base'
      });
      // Get the hit dice in decending order of hitDiceSize
      let compare = (a, b) => collator.compare(b.hitDiceSize, a.hitDiceSize)
      hitDice.sort(compare);
      // Get the total number of hit dice that can be recovered this rest
      let totalHd = hitDice.reduce((sum, hd) => sum + (hd.value || 0), 0);
      let resetMultiplier = creature.settings.hitDiceResetMultiplier || 0.5;
      let recoverableHd = Math.max(Math.floor(totalHd*resetMultiplier), 1);
      // recover each hit dice in turn until the recoverable amount is used up
      let amountToRecover, resultingDamage;
      hitDice.forEach(hd => {
        if (!recoverableHd) return;
        amountToRecover = Math.min(recoverableHd, hd.damage || 0);
        if (!amountToRecover) return;
        recoverableHd -= amountToRecover;
        resultingDamage = hd.damage - amountToRecover;
        CreatureProperties.update(hd._id, {
          $set: {damage: resultingDamage}
        }, {
          selector: {type: 'attribute'},
        });
      });
    }
    recomputeCreatureById(creatureId);
  },
 });
 export default restCreature;
--- a/app/imports/api/getModifierFields.js
+++ b/app/imports/api/getModifierFields.js
@@ -1,28 +0,0 @@
 import MONGO_OPERATORS from '/imports/constants/MONGO_OPERATORS.js';
 const hasAny = function(values){
  for (let value of values){
    if (this.has(value)){
      return true;
    }
  }
  return false;
 };
 // Returns a Set of fields the modifier changes
 // The set has been extended with the "hasAny" function
 export default function getModifierFields (modifier) {
  let fields = new Set();
  for (let operator of MONGO_OPERATORS){
    if (modifier[operator]) for (let field in modifier[operator]){
      const indexOfDot = field.indexOf('.');
      if (indexOfDot !== -1) {
        field = field.substring(0, indexOfDot);
      }
      fields.add(field);
    }
  }
  fields.hasAny = hasAny;
  return fields;
 }
--- a/app/imports/api/icons/Icons.js
+++ b/app/imports/api/icons/Icons.js
@@ -1,97 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import { assertAdmin } from '/imports/api/sharing/sharingPermissions.js';
 let Icons = new Mongo.Collection('icons');
 let iconsSchema = new SimpleSchema({
 	name: {
 		type: String,
    unique: true,
    index: 1,
 	},
 	description: {
 		type: String,
 		optional: true,
 	},
  tags: {
    type: Array,
    optional: true,
    index: 1,
  },
  'tags.$': {
    type: String,
  },
  shape: {
    type: String,
  },
 });
 if (Meteor.isServer) {
  Icons._ensureIndex({
    'name': 'text',
    'description': 'text',
 		'tags': 'text',
  });
 }
 const storedIconsSchema = new SimpleSchema({
  name: {
    type: String,
  },
  shape: {
    type: String,
  },
 });
 Icons.attachSchema(iconsSchema);
 // This method does not validate icons against the schema, use wisely;
 const writeIcons = new ValidatedMethod({
 	name: 'icons.write',
 	validate: null,
 	run(icons){
    assertAdmin(this.userId);
    if (Meteor.isServer){
      this.unblock();
      Icons.rawCollection().insert(icons, {ordered: false});
    }
 	}
 });
 const findIcons = new ValidatedMethod({
  name: 'icons.find',
  validate: new SimpleSchema({
    search: {
      type: String,
      max: 30,
      optional: true,
    },
  }).validator(),
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 20,
    timeInterval: 10000,
  },
  run({search}){
    if (!search) return [];
    if (!Meteor.isServer) return;
    return Icons.find(
      { $text: {$search: search} },
      {
        // relevant documents have a higher score.
        fields: {
          score: { $meta: 'textScore' }
        },
        // `score` property specified in the projection fields above.
        sort: {
          score: { $meta: 'textScore' }
        }
      }
    ).fetch();
  }
 })
 export { writeIcons, findIcons, storedIconsSchema };
 export default Icons;
--- a/app/imports/api/library/Libraries.js
+++ b/app/imports/api/library/Libraries.js
@@ -1,127 +0,0 @@
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import SimpleSchema from 'simpl-schema';
 import SharingSchema from '/imports/api/sharing/SharingSchema.js';
 import simpleSchemaMixin from '/imports/api/creature/mixins/simpleSchemaMixin.js';
 import { assertEditPermission, assertOwnership } from '/imports/api/sharing/sharingPermissions.js';
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
 import { getUserTier } from '/imports/api/users/patreon/tiers.js'
 /**
 * Libraries are trees of library nodes where each node represents a character
 * property.
 *
 * Libraries can be shared, have multiple readers and writers, and can be
 * subscribed to.
 *
 * Permissions to library nodes are controlled by the libraries they belong to.
 */
 let Libraries = new Mongo.Collection('libraries');
 let LibrarySchema = new SimpleSchema({
 	name: {
    type: String,
  },
 	isDefault: {
 		type: Boolean,
 		optional: true,
 	},
 });
 LibrarySchema.extend(SharingSchema);
 Libraries.attachSchema(LibrarySchema);
 export default Libraries;
 const insertLibrary = new ValidatedMethod({
  name: 'libraries.insert',
 	mixins: [
 		simpleSchemaMixin,
  ],
  schema: LibrarySchema.omit('owner', 'isDefault'),
  run(library) {
    if (!this.userId) {
      throw new Meteor.Error('Libraries.methods.insert.denied',
      'You need to be logged in to insert a library');
    }
    let tier = getUserTier(this.userId);
    if (!tier.paidBenefits){
      throw new Meteor.Error('Libraries.methods.insert.denied',
      `The ${tier.name} tier does not allow you to insert a library`);
    }
    library.owner = this.userId;
 		return Libraries.insert(library);
  },
 });
 const updateLibraryName = new ValidatedMethod({
 	name: 'libraries.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}});
 	},
 });
 const setLibraryDefault = new ValidatedMethod({
  name: 'libraries.makeLibraryDefault',
 	validate: new SimpleSchema({
 		_id: {
 			type: String,
 			regEx: SimpleSchema.RegEx.id
 		},
 		isDefault: {
 			type: Boolean,
 		},
 	}).validator(),
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
  run({_id, isDefault}) {
 		if (!Meteor.users.isAdmin()){
 			throw new Meteor.Error('Permission denied', 'User must be admin to set libraries as default');
 		}
 		return Libraries.update(_id, {$set: {isDefault}});
  },
 });
 const removeLibrary = new ValidatedMethod({
 	name: 'libraries.remove',
 	validate: new SimpleSchema({
 		_id: {
 			type: String,
 			regEx: SimpleSchema.RegEx.id
 		},
 	}).validator(),
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
 	run({_id}){
 		let library = Libraries.findOne(_id);
 		assertOwnership(library, this.userId);
 		Libraries.remove(_id);
 		this.unblock();
 		LibraryNodes.remove({'ancestors.id': _id});
 	}
 })
 export { LibrarySchema, insertLibrary, setLibraryDefault, updateLibraryName, removeLibrary };
--- a/app/imports/api/library/LibraryNodes.js
+++ b/app/imports/api/library/LibraryNodes.js
@@ -1,195 +0,0 @@
 import { Meteor } from 'meteor/meteor';
 import { Mongo } from 'meteor/mongo';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import SimpleSchema from 'simpl-schema';
 import ColorSchema from '/imports/api/properties/subSchemas/ColorSchema.js';
 import ChildSchema from '/imports/api/parenting/ChildSchema.js';
 import propertySchemasIndex from '/imports/api/properties/propertySchemasIndex.js';
 import Libraries from '/imports/api/library/Libraries.js';
 import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
 import { softRemove } from '/imports/api/parenting/softRemove.js';
 import SoftRemovableSchema from '/imports/api/parenting/SoftRemovableSchema.js';
 import { storedIconsSchema } from '/imports/api/icons/Icons.js';
 let LibraryNodes = new Mongo.Collection('libraryNodes');
 let LibraryNodeSchema = new SimpleSchema({
 	type: {
    type: String,
    allowedValues: Object.keys(propertySchemasIndex),
  },
 	tags: {
 		type: Array,
 		defaultValue: [],
 	},
 	'tags.$': {
 		type: String,
 	},
  icon: {
    type: storedIconsSchema,
    optional: true,
  }
 });
 for (let key in propertySchemasIndex){
 	let schema = new SimpleSchema({});
 	schema.extend(LibraryNodeSchema);
  schema.extend(ColorSchema);
 	schema.extend(propertySchemasIndex[key]);
 	schema.extend(ChildSchema);
 	schema.extend(SoftRemovableSchema);
 	LibraryNodes.attachSchema(schema, {
 		selector: {type: key}
 	});
 }
 function getLibrary(node){
  if (!node) throw new Meteor.Error('No node provided');
  let library = Libraries.findOne(node.ancestors[0].id);
  if (!library) throw new Meteor.Error('Library does not exist');
  return library;
 }
 function assertNodeEditPermission(node, userId){
  let lib = getLibrary(node);
  return assertEditPermission(lib, userId);
 }
 const insertNode = new ValidatedMethod({
  name: 'libraryNodes.insert',
 	validate: null,
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
  run(libraryNode) {
    delete libraryNode._id;
    assertNodeEditPermission(libraryNode, this.userId);
 		return LibraryNodes.insert(libraryNode);
  },
 });
 const duplicateNode = new ValidatedMethod({
  name: 'libraryNodes.duplicate',
 	validate: new SimpleSchema({
    _id: {
      type: String,
      regEx: SimpleSchema.RegEx.Id,
    }
  }).validator(),
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
  run({_id}) {
    let libraryNode = LibraryNodes.findOne(_id);
    assertNodeEditPermission(libraryNode, this.userId);
    delete libraryNode._id;
 		return LibraryNodes.insert(libraryNode);
  },
 })
 const updateLibraryNode = new ValidatedMethod({
  name: 'libraryNodes.update',
  validate({_id, path}){
 		if (!_id) return false;
 		// We cannot change these fields with a simple update
 		switch (path[0]){
 			case 'type':
      case 'order':
      case 'parent':
      case 'ancestors':
 				return false;
 		}
  },
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
  run({_id, path, value}) {
    let node = LibraryNodes.findOne(_id);
    assertNodeEditPermission(node, this.userId);
    let pathString = path.join('.');
    let modifier;
    // unset empty values
    if (value === null || value === undefined){
      modifier = {$unset: {[pathString]: 1}};
    } else {
      modifier = {$set: {[pathString]: value}};
    }
 		return LibraryNodes.update(_id, modifier, {
 			selector: {type: node.type},
 		});
  },
 });
 const pushToLibraryNode = new ValidatedMethod({
 	name: 'libraryNodes.push',
 	validate: null,
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
 	run({_id, path, value}){
 		let node = LibraryNodes.findOne(_id);
    assertNodeEditPermission(node, this.userId);
 		return LibraryNodes.update(_id, {
 			$push: {[path.join('.')]: value},
 		}, {
 			selector: {type: node.type},
 		});
 	}
 });
 const pullFromLibraryNode = new ValidatedMethod({
 	name: 'libraryNodes.pull',
 	validate: null,
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
 	run({_id, path, itemId}){
 		let node = LibraryNodes.findOne(_id);
    assertNodeEditPermission(node, this.userId);
 		return LibraryNodes.update(_id, {
 			$pull: {[path.join('.')]: {_id: itemId}},
 		}, {
 			selector: {type: node.type},
 			getAutoValues: false,
 		});
 	}
 });
 const softRemoveLibraryNode = new ValidatedMethod({
 	name: 'libraryNodes.softRemove',
 	validate: new SimpleSchema({
 		_id: SimpleSchema.RegEx.Id
 	}).validator(),
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
 	run({_id}){
 		let node = LibraryNodes.findOne(_id);
    assertNodeEditPermission(node, this.userId);
 		softRemove({_id, collection: LibraryNodes});
 	}
 });
 export default LibraryNodes;
 export {
 	LibraryNodeSchema,
 	insertNode,
  duplicateNode,
 	updateLibraryNode,
 	pullFromLibraryNode,
 	pushToLibraryNode,
 	softRemoveLibraryNode,
 };
--- a/app/imports/api/meta/Blacklist.js
+++ b/app/imports/api/meta/Blacklist.js
@@ -1,11 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 Blacklist = new Mongo.Collection("blacklist");
 Schemas.Blacklist = new SimpleSchema({
 	userId: {
 		type: String,
 	},
 });
 Blacklist.attachSchema(Schemas.Blacklist);
--- a/app/imports/api/parenting/ChildSchema.js
+++ b/app/imports/api/parenting/ChildSchema.js
@@ -1,33 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 const RefSchema = new SimpleSchema({
  id: {
    type: String,
    regEx: SimpleSchema.RegEx.Id,
    index: 1
  },
  collection: {
    type: String
  },
 });
 let ChildSchema = new SimpleSchema({
  order: {
    type: Number,
  },
 	parent: {
    type: RefSchema,
    optional: true,
  },
  ancestors: {
    type: Array,
    defaultValue: [],
    max: 100,
  },
  'ancestors.$': {
    type: RefSchema,
  },
 });
 export default ChildSchema;
 export { RefSchema };
--- a/app/imports/api/parenting/SoftRemovableSchema.js
+++ b/app/imports/api/parenting/SoftRemovableSchema.js
@@ -1,22 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 let SoftRemovableSchema = new SimpleSchema({
 	"removed": {
    type: Boolean,
    optional: true,
    index: 1,
  },
  "removedAt": {
    type: Date,
    optional: true,
    index: 1,
  },
  "removedWith": {
    optional: true,
    type: String,
    regEx: SimpleSchema.RegEx.Id,
    index: 1,
  },
 });
 export default SoftRemovableSchema;
--- a/app/imports/api/parenting/fetchDocByRef.js
+++ b/app/imports/api/parenting/fetchDocByRef.js
@@ -1,12 +0,0 @@
 import getCollectionByName from '/imports/api/parenting/getCollectionByName.js';
 const docNotFoundError = function({id, collection}){
  throw new Meteor.Error('document-not-found',
    `No document could be found with id: ${id} in ${collection}`
  );
 };
 export default function fetchDocByRef({id, collection}, options){
  return getCollectionByName(collection).findOne(id, options) ||
    docNotFoundError({id, collection});
 }
--- a/app/imports/api/parenting/getCollectionByName.js
+++ b/app/imports/api/parenting/getCollectionByName.js
@@ -1,11 +0,0 @@
 const collectionDoesntExistError = function(collectionName){
  throw new Meteor.Error('bad-collection-reference',
    `Parent references collection ${collectionName}, which does not exist`
  );
 };
 const getCollectionByName = function(name){
  return Mongo.Collection.get(name) || collectionDoesntExistError(name);
 };
 export default getCollectionByName;
--- a/app/imports/api/parenting/getDescendantsInDepthFirstOrder.js
+++ b/app/imports/api/parenting/getDescendantsInDepthFirstOrder.js
@@ -1,27 +0,0 @@
 import { nodesToTree } from '/imports/api/parenting/parenting.js';
 export default function getDescendantsInDepthFirstOrder({
  collection,
  ancestorId,
  filter,
  options = {fields: {order: 1, ancestors: 1}},
 }){
  let forest = nodesToTree({collection, ancestorId, filter, options});
  let orderMemo = getDocsInDepthFirstOrder(forest);
  return orderMemo;
 }
 export function getDocsInDepthFirstOrder(forest){
  let docs = [];
  forest.forEach(node => {
    addNodeAndTraverse(node, docs)
  });
  return docs;
 }
 function addNodeAndTraverse(node, docs){
  docs.push(node.node);
  node.children.forEach(child => {
    addNodeAndTraverse(child, docs)
  });
 }
--- a/app/imports/api/parenting/order.js
+++ b/app/imports/api/parenting/order.js
@@ -1,156 +0,0 @@
 import fetchDocByRef from '/imports/api/parenting/fetchDocByRef.js';
 import getCollectionByName from '/imports/api/parenting/getCollectionByName.js';
 import getDescendantsInDepthFirstOrder from '/imports/api/parenting/getDescendantsInDepthFirstOrder.js'
 // Docs keep track of their depth-first order amongst their entire ancestor tree
 export function compareOrder(docA, docB){
  // < 0 if A comes before B
  // = 0 if A and B are the same order
  // > 0 if B comes before A
  // They must share a root ancestor to be meaningfully sorted
  if (docA.ancestors[0].id !== docB.ancestors[0].id){
    return 0;
  } else {
    return docA.order - docB.order;
  }
 }
 export function getHighestOrder({collection, ancestorId}){
  const highestOrderedDoc = collection.findOne({
    'ancestors.id': ancestorId,
  }, {
    fields: {order: 1},
    sort: {order: -1},
  });
  return highestOrderedDoc ? highestOrderedDoc.order : -1;
 }
 export function setDocToLastOrder({collection, doc}){
  doc.order = getHighestOrder({
    collection,
    ancestorId: doc.ancestors[0].id,
  }) + 1;
 }
 // update the order of a doc, and shift the related docs around to suit the new
 // order
 function cheapUpdateDocOrder({docRef, order}){
  let doc = fetchDocByRef(docRef, {fields: {
    order: 1,
    parent: 1,
  }});
  let collection = getCollectionByName(docRef.collection);
  const currentOrder = doc.order;
  if (currentOrder === order){
    return;
  } else {
    // First move the documents that are in the way
    let inBetweenSelector, increment;
    if (order > currentOrder){
      // Move in-between docs backward
      inBetweenSelector = {
        $gt: currentOrder,
        $lte: order
      };
      increment = -1;
    } else if (order < currentOrder){
      // Move in-between docs forward
      inBetweenSelector = {
        $lt: currentOrder,
        $gte: order
      };
      increment = 1;
    }
    collection.update({
      'ancestors.id': doc.ancestors[0].id,
      order: inBetweenSelector,
    }, {
      $inc: {order: increment},
    }, {
      multi: true,
      selector: {type: 'any'},
    });
    // Then move the document itself
    collection.update(doc._id, {$set: {order}}, {selector: {type: 'any'}});
  }
 }
 export function cheapRemovedDocAtOrder({collection, doc}){
  // Decrement the order of all docs after the removed doc
  collection.update({
    'ancestors.id': doc.ancestors[0].id,
    order: {$gt: doc.order},
  }, {
    $inc: {order: -1},
  }, {
    multi: true,
    selector: {type: 'any'},
  });
 }
 export function cheapInsertedDocAtOrder({collection, ancestorId, order}){
  // Increment the order of all docs after the inserted doc
  collection.update({
    'ancestors.id': ancestorId,
    order: {$gte: order},
  }, {
    $inc: {order: 1},
  }, {
    multi: true,
    selector: {type: 'any'},
  });
 }
 // Update the order a single doc and re-order the entire related doc list
 // with the change
 export function safeUpdateDocOrder({docRef, order}){
  let collection = getCollectionByName(docRef.collection);
  // Put the new doc half a step in front of its new order
  // to ensure it's in front of whichever doc was there before
  collection.update(docRef.id, {
    $set: {order}
  }, {
    selector: {type: 'any'}
  });
  // reorder all related docs so that order is back to being a continous
  // set of whole numbers
  let movedDoc = fetchDocByRef(docRef, {fields: {ancestors: 1}});
  let ancestorId = movedDoc.ancestors[0].id;
  reorderDocs({collection, ancestorId});
 }
 export function reorderDocs({collection, ancestorId}){
  let orderedDocs = getDescendantsInDepthFirstOrder({collection, ancestorId});
  let bulkWrite = [];
  orderedDocs.forEach((doc, index) => {
    if (doc.order !== index){
      bulkWrite.push({
        updateOne : {
          filter: {_id: doc._id},
          update: {$set: {order: index}},
        },
      });
    }
  });
  if (Meteor.isServer && bulkWrite.length){
    collection.rawCollection().bulkWrite(
      bulkWrite,
      {ordered : false},
      function(e){
        if (e) {
          console.error('Bulk write failed: ');
          console.error(e);
        }
      }
    );
  } else {
    bulkWrite.forEach(op => {
      collection.update(
        op.updateOne.filter,
        op.updateOne.update,
        {selector: {type: 'any'}}
      );
    });
  }
 }
--- a/app/imports/api/parenting/organizeMethods.js
+++ b/app/imports/api/parenting/organizeMethods.js
@@ -1,110 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 import { union } from 'lodash';
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import { updateParent } from '/imports/api/parenting/parenting.js';
 import { reorderDocs, safeUpdateDocOrder } from '/imports/api/parenting/order.js';
 import { RefSchema } from '/imports/api/parenting/ChildSchema.js';
 import { assertDocEditPermission } from '/imports/api/sharing/sharingPermissions.js';
 import fetchDocByRef from '/imports/api/parenting/fetchDocByRef.js';
 import getCollectionByName from '/imports/api/parenting/getCollectionByName.js';
 import { recomputeCreatureById } from '/imports/api/creature/computation/recomputeCreature.js';
 const organizeDoc = new ValidatedMethod({
  name: 'organize.organizeDoc',
  validate: new SimpleSchema({
    docRef: RefSchema,
    parentRef: RefSchema,
    order: {
      type: Number,
      // Should end in 0.5 to place it reliably between two existing documents
    },
  }).validator(),
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
  run({docRef, parentRef, order}) {
    let doc = fetchDocByRef(docRef);
    let collection = getCollectionByName(docRef.collection);
    // The user must be able to edit both the doc and its parent to move it
    // successfully
    assertDocEditPermission(doc, this.userId);
    let parent = fetchDocByRef(parentRef);
    assertDocEditPermission(parent, this.userId);
    // Change the doc's parent
    updateParent({docRef, parentRef});
    // Change the doc's order to be a half step ahead of its target location
    collection.update(doc._id, {$set: {order}}, {selector: {type: 'any'}});
    // Reorder both ancestors' documents
    let oldAncestorId = doc.ancestors[0].id;
    reorderDocs({collection, ancestorId: oldAncestorId});
    let newAncestorId = getRootId(parent);
    if (newAncestorId !== oldAncestorId){
      reorderDocs({collection, ancestorId: newAncestorId});
    }
    // Figure out which creatures need to be recalculated after this move
    let docCreatures = getCreatureAncestors(doc);
    let parentCreatures = getCreatureAncestors(parent);
    let creaturesToRecompute = union(docCreatures, parentCreatures);
    // Recompute the creatures
    creaturesToRecompute.forEach(id => {
      recomputeCreatureById(id);
    });
  },
 });
 const reorderDoc = new ValidatedMethod({
  name: 'organize.reorderDoc',
  validate: new SimpleSchema({
    docRef: RefSchema,
    order: {
      type: Number,
      // Should end in 0.5 to place it reliably between two existing documents
    },
  }).validator(),
  mixins: [RateLimiterMixin],
  rateLimit: {
    numRequests: 5,
    timeInterval: 5000,
  },
  run({docRef, order}) {
    let doc = fetchDocByRef(docRef);
    assertDocEditPermission(doc, this.userId);
    safeUpdateDocOrder({docRef, order});
    // Recompute the affected creatures
    getCreatureAncestors(doc).forEach(id => {
      recomputeCreatureById(id);
    });
  },
 });
 function getRootId(doc){
  if (doc.ancestors && doc.ancestors.length && doc.ancestors[0]){
    return doc.ancestors[0].id;
  } else {
    return doc._id;
  }
 }
 function getCreatureAncestors(doc){
  let ids = [];
  if(doc.type === 'pc' || doc.type === 'npc' || doc.type === 'monster'){
    ids.push(doc._id);
  }
  if (doc.ancestors){
    doc.ancestors.forEach(ancestorRef => {
      if (ancestorRef.collection === 'creatures'){
        ids.push(ancestorRef.id);
      }
    });
  }
  return ids;
 }
 export { organizeDoc, reorderDoc };
--- a/app/imports/api/parenting/parenting.js
+++ b/app/imports/api/parenting/parenting.js
@@ -1,251 +0,0 @@
 import fetchDocByRef from '/imports/api/parenting/fetchDocByRef.js';
 import getCollectionByName from '/imports/api/parenting/getCollectionByName.js';
 import { flatten, findLast } from 'lodash';
 const generalParents = [
  'attribute',
  'buff',
  'classLevel',
  'feature',
  'folder',
  'root',
  'item',
  'spell',
 ];
 // Which types are allowed as parents for other types
 const allowedParenting = {
  folder: [...generalParents, 'container'],
  rollResult: ['roll', 'rollResult'],
  container: ['root', 'folder'],
  item: ['root', 'container', 'folder'],
 };
 const allParentTypes = new Set(flatten(Object.values(allowedParenting)));
 export function canBeParent(type){
  return true;
  //TODO until there is a good reason to disallow certain parenting options,
  // this should just let the user do whatever
  return type && allParentTypes.has(type);
 }
 export function getAllowedParents({childType}){
  return allowedParenting[childType] || generalParents;
 }
 export function isParentAllowed({parentType = 'root', childType}){
  return true;
  //TODO until there is a good reason to disallow certain parenting options,
  // this should just let the user do whatever
  if (!childType) throw 'childType is required';
  let allowedParents = getAllowedParents({childType});
  return allowedParents.includes(parentType);
 }
 export function fetchParent({id, collection}){
  return fetchDocByRef({id, collection});
 }
 export function fetchChildren({ collection, parentId, filter = {}, options = {sort: {order: 1}} }){
  filter['parent.id'] = parentId;
  let children = [];
  children.push(
    ...collection.find({
      'parent.id': parentId
    }, options).fetch()
  );
  return children;
 }
 export function updateChildren({collection, parentId, filter = {}, modifier, options={}}){
  filter['parent.id'] = parentId;
  options.multi = true;
  collection.update(filter, modifier, options);
 }
 export function fetchDescendants({ collection, ancestorId, filter = {}, options}){
  filter['ancestors.id'] = ancestorId;
  let descendants = [];
  descendants.push(...collection.find(filter, options).fetch());
  return descendants;
 }
 export function updateDescendants({collection, ancestorId, filter = {}, modifier, options={}}){
  filter['ancestors.id'] = ancestorId;
  options.multi = true;
  options.selector = {type: 'any'};
  collection.update(filter, modifier, options);
 }
 export function forEachDescendant({collection, ancestorId, filter = {}, options}, callback){
  filter['ancestors.id'] = ancestorId;
  collection.find(filter, options).forEach(callback);
 }
 // 1 database read
 export function getAncestry({parentRef, inheritedFields = {}}){
  let parentDoc = fetchDocByRef(parentRef, {fields: inheritedFields});
  let parent = { ...parentRef};
  for (let field in inheritedFields){
    if (inheritedFields[field]){
      parent[field] = parentDoc[field];
    }
  }
  // Ancestors is [...parent's ancestors, parent ref]
  let ancestors = parentDoc.ancestors || [];
  ancestors.push(parent);
  return {parentDoc, parent, ancestors};
 }
 export function setLineageOfDocs({docArray, oldParent, newAncestry}){
  //const oldParent = oldAncestry[oldAncestry.length - 1];
  const newParent = newAncestry[newAncestry.length - 1];
  docArray.forEach(doc => {
    if(doc.parent.id === oldParent.id){
      doc.parent = newParent;
    }
    let oldAncestors = doc.ancestors;
    let oldParentIndex = oldAncestors.findIndex(a => a.id === oldParent.id);
    doc.ancestors = [...newAncestry, ...oldAncestors.slice(oldParentIndex + 1)];
  });
 }
 /**
 * Give documents new random ids and transform their references.
 * Transform collections of re-IDed docs according to the collection map
 */
 export function renewDocIds({docArray, collectionMap}){
  // map of {oldId: newId}
  let idMap = {};
  // Give new ids and map the changes
  docArray.forEach(doc => {
    let oldId = doc._id;
    let newId = Random.id();
    doc._id = newId;
    idMap[oldId] = newId;
  });
  const remapReference = ref => {
    if (idMap[ref.id]){
      ref.id = idMap[ref.id];
      ref.collection = collectionMap && collectionMap[ref.collection] || ref.collection;
    }
  }
  docArray.forEach(doc => {
    remapReference(doc.parent);
    doc.ancestors.forEach(remapReference);
  });
 }
 export function updateParent({docRef, parentRef}){
  let collection = getCollectionByName(docRef.collection);
  let oldDoc = fetchDocByRef(docRef, {fields: {
    parent: 1,
    ancestors: 1,
    type: 1,
  }});
  let updateOptions = { selector: {type: 'any'} };
  // Skip if we aren't changing the parent id
  if (oldDoc.parent.id === parentRef.id) return;
  // Get the parent and its ancestry
  let {parentDoc, parent, ancestors} = getAncestry({parentRef});
  // Check that the doc isn't its own ancestor
  ancestors.forEach(ancestor => {
    if (docRef.id === ancestor.id){
      throw new Meteor.Error('invalid parenting',
        'A doc can\'t be its own ancestor')
    }
  });
  // If the doc and its parent are in the same collection, apply the allowed
  // parent rules based on type
  if (docRef.collection === parentRef.collection){
    let parentAllowed = isParentAllowed({
      parentType: parentDoc.type,
      childType: oldDoc.type
    });
    if (!parentAllowed){
      throw new Meteor.Error('invalid parenting',
        `Can't make ${oldDoc.type} a child of ${parentDoc.type}`)
    }
  }
  // update the document's parenting
  collection.update(docRef.id, {
    $set: {parent, ancestors}
  }, updateOptions);
  // Remove the old ancestors from the descendants
  updateDescendants({
    collection,
    ancestorId: docRef.id,
    modifier: {$pullAll: {
      ancestors: oldDoc.ancestors,
    }},
    options: updateOptions,
  });
  // Add the new ancestors to the descendants
  updateDescendants({
    collection,
    ancestorId: docRef.id,
    modifier: {$push: {
      ancestors: {
        $each: ancestors,
        $position: 0,
      },
    }},
    options: updateOptions,
  });
 }
 export function getName(doc){
  if (doc.name) return name;
  var i = doc.ancestors.length;
  while(i--) {
    if (doc.ancestors[i].name) return doc.ancestors[i].name;
  }
 }
 export function nodeArrayToTree(nodes){
  // Store a dict and list of all the nodes
  let nodeIndex = {};
  let nodeList = [];
  nodes.forEach( node => {
    let treeNode = {
      node: node,
      children: [],
    };
    nodeIndex[node._id] = treeNode;
    nodeList.push(treeNode);
  });
  // Create a forest of trees
  let forest = [];
  // Either the node is a child of its nearest found ancestor, or in the forest as a root
  nodeList.forEach(treeNode => {
    let ancestorInForest = findLast(
      treeNode.node.ancestors,
      ancestor => !!nodeIndex[ancestor.id]
    );
    if (ancestorInForest){
      nodeIndex[ancestorInForest.id].children.push(treeNode);
    } else {
      forest.push(treeNode);
    }
  });
  return forest;
 }
 export function nodesToTree({collection, ancestorId, filter = {}, options = {}}){
  if (!('ancestors.id' in filter)) filter['ancestors.id'] = ancestorId;
  if (!('removed' in filter)) filter['removed'] = {$ne: true};
  if (!options.sort) options.sort = {order: 1};
  if (!('order' in options.sort)) options.sort.order = 1;
  let nodes = collection.find(filter, options);
  return nodeArrayToTree(nodes);
 }
--- a/app/imports/api/parenting/softRemove.js
+++ b/app/imports/api/parenting/softRemove.js
@@ -1,69 +0,0 @@
 import getCollectionByName from '/imports/api/parenting/getCollectionByName.js';
 import { updateDescendants } from '/imports/api/parenting/parenting.js';
 export function softRemove({_id, collection}){
  let removalDate = new Date();
  if (typeof collection === 'string') {
    collection = getCollectionByName(collection);
  }
  // Remove this document
  collection.update(
    _id, {
      $set: {
        removed: true,
        removedAt: removalDate,
      },
      $unset: {
        removedWith: 1,
      }
    }, {
      selector: {type: 'any'},
    },
  );
  // Remove all the descendants that have not yet been removed, and set them to be
  // removed with this document
  updateDescendants({
    collection,
    ancestorId: _id,
    filter: {removed: {$ne: true}},
    modifier: {$set: {
      removed: true,
      removedAt: removalDate,
      removedWith: _id,
    }},
  });
 }
 const restoreError = function(){
  throw new Meteor.Error('restore-failed',
    'Could not restore this document, maybe it was removed by a parent?'
  );
 };
 export function restore({_id, collection}){
  if (typeof collection === 'string') {
    collection = getCollectionByName(collection);
  }
  let numUpdated = collection.update({
    _id,
    removedWith: {$exists: false}
  }, { $unset: {
    removed: 1,
    removedAt: 1,
  }}, {
    selector: {type: 'any'},
  },);
  if (numUpdated === 0) restoreError();
  updateDescendants({
    collection,
    ancestorId: _id,
    filter: {
      removedWith: _id,
    },
    modifier: { $unset: {
      removed: 1,
      removedAt: 1,
      removedWith: 1,
    }},
  });
 }
--- a/app/imports/api/properties/Actions.js
+++ b/app/imports/api/properties/Actions.js
@@ -1,184 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js';
 import { storedIconsSchema } from '/imports/api/icons/Icons.js'
 /*
 * Actions are things a character can do
 * Any rolls that are children of actions will be rolled when taking the action
 * Any actions that are children of this action will be considered alternatives
 * to this action
 */
 let ActionSchema = new SimpleSchema({
 	name: {
 		type: String,
 		optional: true,
 	},
 	summary: {
 		type: String,
 		optional: true,
 	},
 	description: {
 		type: String,
 		optional: true,
 	},
 	// What time-resource is used to take the action in combat
 	// long actions take longer than 1 round to cast
 	actionType: {
 		type: String,
 		allowedValues: ['action', 'bonus', 'attack', 'reaction', 'free', 'long'],
 		defaultValue: 'action',
 	},
 	// Who is the action directed at
 	target: {
 		type: String,
 		defaultValue: 'singleTarget',
 		allowedValues: [
      'self',
      'singleTarget',
 			'multipleTargets',
    ],
 	},
  tags: {
    type: Array,
    defaultValue: [],
  },
  'tags.$': {
    type: String,
  },
  // Duplicate the ResourceSchema here so we can extend it elegantly.
  resources: {
    type: Object,
    defaultValue: {},
  },
  'resources.itemsConsumed': {
    type: Array,
    defaultValue: [],
  },
  'resources.itemsConsumed.$': {
    type: Object,
  },
  'resources.itemsConsumed.$._id': {
    type: String,
    regEx: SimpleSchema.RegEx.Id,
    autoValue(){
      if (!this.isSet) return Random.id();
    }
  },
  'resources.itemsConsumed.$.tag': {
    type: String,
    optional: true,
  },
  'resources.itemsConsumed.$.quantity': {
    type: Number,
    defaultValue: 1,
  },
  'resources.itemsConsumed.$.itemId': {
    type: String,
    optional: true,
  },
  'resources.attributesConsumed': {
    type: Array,
    defaultValue: [],
  },
  'resources.attributesConsumed.$': {
    type: Object,
  },
  'resources.attributesConsumed.$._id': {
    type: String,
    regEx: SimpleSchema.RegEx.Id,
    autoValue(){
      if (!this.isSet) return Random.id();
    }
  },
  'resources.attributesConsumed.$.variableName': {
    type: String,
    optional: true,
  },
  'resources.attributesConsumed.$.quantity': {
    type: Number,
    defaultValue: 1,
  },
 	// Calculation of how many times this action can be used
 	uses: {
 		type: String,
 		optional: true,
 	},
 	// Integer of how many times it has already been used
 	usesUsed: {
 		type: SimpleSchema.Integer,
 		optional: true,
 	},
 	// How this action's uses are reset automatically
 	reset: {
 		type: String,
 		allowedValues: ['longRest', 'shortRest'],
 		optional: true,
 	},
 });
 const ComputedOnlyActionSchema = new SimpleSchema({
  usesResult: {
    type: SimpleSchema.Integer,
    optional: true,
  },
  usesErrors: {
    type: Array,
    optional: true,
  },
  'usesErrors.$':{
    type: ErrorSchema,
  },
  resources: Object,
  'resources.itemsConsumed': Array,
  'resources.itemsConsumed.$': Object,
  'resources.itemsConsumed.$.available': {
    type: Number,
    optional: true,
  },
  // This appears both in the computed and uncomputed schema because it can be
  // set by both a computation or a form
  'resources.itemsConsumed.$.itemId': {
    type: String,
    regEx: SimpleSchema.RegEx.Id,
    optional: true,
  },
  'resources.itemsConsumed.$.itemName': {
    type: String,
    optional: true,
  },
  'resources.itemsConsumed.$.itemIcon': {
    type: storedIconsSchema,
    optional: true,
  },
  'resources.itemsConsumed.$.itemColor': {
    type: String,
    optional: true,
  },
  'resources.attributesConsumed': Array,
  'resources.attributesConsumed.$': Object,
  'resources.attributesConsumed.$.available': {
    type: Number,
    optional: true,
  },
  'resources.attributesConsumed.$.statId': {
    type: String,
    regEx: SimpleSchema.RegEx.Id,
    optional: true,
  },
  'resources.attributesConsumed.$.statName': {
    type: String,
    optional: true,
  },
  // True if the uses left is zero, or any item or attribute consumed is
  // insufficient
  insufficientResources: {
    type: Boolean,
    optional: true,
  },
 });
 const ComputedActionSchema = new SimpleSchema()
  .extend(ActionSchema)
  .extend(ComputedOnlyActionSchema);
 export { ActionSchema, ComputedOnlyActionSchema, ComputedActionSchema};
--- a/app/imports/api/properties/Adjustments.js
+++ b/app/imports/api/properties/Adjustments.js
@@ -1,33 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 const AdjustmentSchema = new SimpleSchema({
 	// The roll that determines how much to change the attribute
  // This can be simplified, but should only compute when activated
  amount: {
    type: String,
    optional: true,
    defaultValue: '1',
  },
 	// Who this adjustment applies to
 	target: {
 		type: String,
    defaultValue: 'every',
 		allowedValues: [
      'self',   // the character who took the action
      'each',   // rolled once for `each` target
      'every',  // rolled once and applied to `every` target
    ],
 	},
 	// The stat this rolls applies to
 	stat: {
 		type: String,
    optional: true,
 	},
  operation: {
    type: String,
    allowedValues: ['set', 'increment'],
    defaultValue: 'increment',
  },
 });
 export { AdjustmentSchema };
--- a/app/imports/api/properties/Attacks.js
+++ b/app/imports/api/properties/Attacks.js
@@ -1,49 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 import { ActionSchema, ComputedOnlyActionSchema } from '/imports/api/properties/Actions.js';
 import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js';
 // Attacks are special instances of actions
 let AttackSchema = new SimpleSchema()
  .extend(ActionSchema)
  .extend({
    // What gets added to the d20 roll
    rollBonus: {
      type: String,
      defaultValue: 'strength.modifier + proficiencyBonus',
      optional: true,
    },
    // Set better defaults for the action
    actionType: {
      type: String,
      defaultValue: 'attack',
    },
    tags: {
      type: Array,
      defaultValue: ['attack'],
    },
    'tags.$': {
      type: String,
    },
  });
 const ComputedOnlyAttackSchema = new SimpleSchema()
  .extend(ComputedOnlyActionSchema)
  .extend({
    rollBonusResult: {
      type: Number,
      optional: true,
    },
    rollBonusErrors: {
      type: Array,
      optional: true,
    },
    'rollBonusErrors.$':{
      type: ErrorSchema,
    },
  });
 const ComputedAttackSchema = new SimpleSchema()
  .extend(AttackSchema)
  .extend(ComputedOnlyAttackSchema);
 export { AttackSchema, ComputedOnlyAttackSchema, ComputedAttackSchema };
--- a/app/imports/api/properties/Attributes.js
+++ b/app/imports/api/properties/Attributes.js
@@ -1,130 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js';
 import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js';
 /*
 * Attributes are numbered stats of a character
 */
 let AttributeSchema = new SimpleSchema({
  name: {
 		type: String,
    defaultValue: 'New Attribute',
 	},
  // The technical, lowercase, single-word name used in formulae
  variableName: {
    type: String,
 		regEx: VARIABLE_NAME_REGEX,
    min: 2,
    defaultValue: 'newAttribute',
  },
 	// How it is displayed and computed is determined by type
  attributeType: {
    type: String,
    allowedValues: [
      'ability', //Strength, Dex, Con, etc.
      'stat', // Speed, Armor Class
 			'modifier', // Proficiency Bonus, Initiative
      'hitDice', // d12 hit dice
      'healthBar', // Hitpoints, Temporary Hitpoints, can take damage
 			'bar', // Displayed as a health bar, can't take damage
      'resource', // Rages, sorcery points
      'spellSlot', // Level 1, 2, 3... spell slots
      'utility', // Aren't displayed, Jump height, Carry capacity
    ],
    defaultValue: 'stat',
 		index: 1,
  },
  // For type hitDice, the size needs to be stored separately
  hitDiceSize: {
    type: String,
    allowedValues: ['d4', 'd6', 'd8', 'd10', 'd12', 'd20'],
    optional: true,
  },
  // For type spellSlot, the level needs to be stored separately
  spellSlotLevelCalculation: {
    type: String,
 		optional: true,
  },
 	// The starting value, before effects
 	baseValueCalculation: {
 		type: String,
 		optional: true,
 	},
  // Description of what the attribute is used for
  description: {
 		type: String,
 		optional: true,
 	},
 	// The damage done to the attribute, always positive
  damage: {
    type: SimpleSchema.Integer,
    optional: true,
 		min: 0,
  },
  // Can the value be decimal?
  decimal: {
    type: Boolean,
    optional: true,
  },
 	// Automatically zero the adjustment on these conditions
  reset: {
    type: String,
    optional: true,
    allowedValues: ['shortRest', 'longRest'],
  },
 });
 let ComputedOnlyAttributeSchema = new SimpleSchema({
  // The result of baseValueCalculation
  baseValue: {
    type: SimpleSchema.oneOf(Number, String, Boolean),
    optional: true,
  },
  baseValueErrors: {
    type: Array,
    optional: true,
  },
  'baseValueErrors.$': {
    type: ErrorSchema,
  },
  // The result of spellSlotLevelCalculation
  spellSlotLevelValue: {
    type: SimpleSchema.oneOf(Number, String, Boolean),
    optional: true,
  },
  spellSlotLevelErrors: {
    type: Array,
    optional: true,
  },
  'spellSlotLevelErrors.$': {
    type: ErrorSchema,
  },
 	// The computed value of the attribute
  value: {
    type: SimpleSchema.oneOf(Number, String, Boolean),
 		defaultValue: 0,
    optional: true,
  },
  // The computed value of the attribute minus the damage
  currentValue: {
    type: SimpleSchema.oneOf(Number, String, Boolean),
 		defaultValue: 0,
    optional: true,
  },
 	// The computed modifier, provided the attribute type is `ability`
 	modifier: {
 		type: SimpleSchema.Integer,
 		optional: true,
 	},
  // Should this attribute hide
  hide: {
    type: Boolean,
    optional: true,
  },
 });
 const ComputedAttributeSchema = new SimpleSchema()
  .extend(ComputedOnlyAttributeSchema)
  .extend(AttributeSchema);
 export { AttributeSchema, ComputedOnlyAttributeSchema, ComputedAttributeSchema };
--- a/app/imports/api/properties/Buffs.js
+++ b/app/imports/api/properties/Buffs.js
@@ -1,59 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 let BuffSchema = new SimpleSchema({
 	name: {
 		type: String,
 		optional: true,
 	},
 	description: {
 		type: String,
 		optional: true,
 	},
 	duration: {
 		type: String,
 		optional: true,
 	},
  applied: {
    type: Boolean,
    defaultValue: false,
    index: 1,
  },
  target: {
 		type: String,
 		allowedValues: [
      'self',  // the character who took the buff
      'each',  // rolled once for `each` target
      'every', // rolled once and applied to `every` target
    ],
 		defaultValue: 'every',
 	},
 });
 let AppliedBuffSchema = new SimpleSchema({
  applied: {
    type: Boolean,
    defaultValue: true,
    index: 1,
  },
 	durationSpent: {
 		type: Number,
 		optional: true,
 		min: 0,
 	},
 	appliedBy: {
 		type: Object,
    optional: true,
 	},
 	'appliedBy.name': {
 		type: String,
 	},
 	'appliedBy.id': {
 		type: String,
 		regEx: SimpleSchema.RegEx.Id,
 	},
 	'appliedBy.collection': {
 		type: String,
 	},
 }).extend(BuffSchema);
 export { AppliedBuffSchema, BuffSchema };
--- a/app/imports/api/properties/ClassLevels.js
+++ b/app/imports/api/properties/ClassLevels.js
@@ -1,37 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js';
 let ClassLevelSchema = new SimpleSchema({
 	name: {
 		type: String,
 		optional: true,
 	},
  description: {
    type: String,
    optional: true,
  },
 	// The name of this class level's variable
 	variableName: {
    type: String,
    min: 2,
 		regEx: VARIABLE_NAME_REGEX,
  },
 	level: {
    type: SimpleSchema.Integer,
 		defaultValue: 1,
  },
 	nextLevelTags: {
 		type: Array,
 		defaultValue: [],
 	},
 	'nextLevelTags.$': {
 		type: String,
 	},
  // Same as in SlotFillers.js
  slotFillerCondition: {
    type: String,
    optional: true,
  },
 });
 export { ClassLevelSchema };
--- a/app/imports/api/properties/Containers.js
+++ b/app/imports/api/properties/Containers.js
@@ -1,47 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 let ContainerSchema = new SimpleSchema({
 	name: {
 		type: String,
 		optional: true,
 		trim: false
 	},
 	carried: {
 		type: Boolean,
 		defaultValue: true,
 		optional: true,
 	},
 	contentsWeightless: {
 		type: Boolean,
 		optional: true,
 	},
 	weight: {
 		type: Number,
 		min: 0,
    optional: true,
 	},
 	value: {
 		type: Number,
 		min: 0,
    optional: true,
 	},
 	description: {
 		type: String,
 		optional: true,
 		trim: false
 	},
 });
 const ComputedOnlyContainerSchema = new SimpleSchema({
  // Weight of all the contents, zero if `contentsWeightless` is true
  contentsWeight:{
    type: Number,
    optional: true,
  },
 });
 const ComputedContainerSchema = new SimpleSchema()
 	.extend(ComputedOnlyContainerSchema)
 	.extend(ContainerSchema);
 export { ContainerSchema, ComputedContainerSchema };
--- a/app/imports/api/properties/DamageMultipliers.js
+++ b/app/imports/api/properties/DamageMultipliers.js
@@ -1,46 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 import DAMAGE_TYPES from '/imports/constants/DAMAGE_TYPES.js';
 /*
 * DamageMultipliers are multipliers that affect how much damage is taken from
 * a given damage type
 */
 let DamageMultiplierSchema = new SimpleSchema({
  name: {
 		type: String,
 		optional: true,
 	},
  damageTypes: {
    type: Array,
    defaultValue: [],
  },
  // The technical, lowercase, single-word name used in formulae
  'damageTypes.$': {
    type: String,
 		allowedValues: DAMAGE_TYPES,
  },
 	// The value of the damage multiplier
 	value: {
    type: Number,
 		defaultValue: 0.5,
 		allowedValues: [0, 0.5, 2],
  },
  // Tags which bypass this multiplier (OR)
  excludeTags: {
    type: Array,
    defaultValue: [],
  },
  'excludeTags.$': {
    type: String,
  },
  // Tags which must be present to be affected by this multiplier (AND)
  includeTags: {
    type: Array,
    defaultValue: [],
  },
  'includeTags.$': {
    type: String,
  },
 });
 export { DamageMultiplierSchema };
--- a/app/imports/api/properties/Damages.js
+++ b/app/imports/api/properties/Damages.js
@@ -1,29 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 import DAMAGE_TYPES from '/imports/constants/DAMAGE_TYPES.js';
 const DamageSchema = new SimpleSchema({
 	// The roll that determines how much to damage the attribute
  // This can be simplified, but only computed when applied
  amount: {
    type: String,
    optional: true,
    defaultValue: '1d8 + strength.modifier',
  },
 	// Who this damage applies to
 	target: {
 		type: String,
    defaultValue: 'every',
 		allowedValues: [
      'self',   // the character who took the action
      'each',   // rolled once for `each` target
      'every',  // rolled once and applied to `every` target
    ],
 	},
 	damageType: {
 		type: String,
 		allowedValues: DAMAGE_TYPES,
 		defaultValue: 'slashing',
 	},
 });
 export { DamageSchema };
--- a/app/imports/api/properties/Effects.js
+++ b/app/imports/api/properties/Effects.js
@@ -1,64 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js';
 /*
 * Effects are reason-value attached to skills and abilities
 * that modify their final value or presentation in some way
 */
 let EffectSchema = new SimpleSchema({
 	name: {
 		type: String,
 		optional: true,
 	},
 	operation: {
 		type: String,
 		defaultValue: 'add',
 		allowedValues: [
 			'base',
 			'add',
 			'mul',
 			'min',
 			'max',
      'set',
 			'advantage',
 			'disadvantage',
 			'passiveAdd',
 			'fail',
 			'conditional',
 			'rollBonus',
 		],
 	},
 	calculation: {
 		type: String,
 		optional: true,
 	},
 	//which stats the effect is applied to
 	stats: {
 		type: Array,
 		defaultValue: [],
 	},
 	'stats.$': {
 		type: String,
 	},
 });
 const ComputedOnlyEffectSchema = new SimpleSchema({
 	// The computed result of the effect
 	result: {
 		type: SimpleSchema.oneOf(Number, String, Boolean),
 		optional: true,
 	},
  // The errors encountered while computing the result
  errors: {
    type: Array,
    optional: true,
  },
  'errors.$':{
    type: ErrorSchema,
  },
 });
 const ComputedEffectSchema = new SimpleSchema()
 	.extend(ComputedOnlyEffectSchema)
 	.extend(EffectSchema);
 export { EffectSchema, ComputedEffectSchema, ComputedOnlyEffectSchema };
--- a/app/imports/api/properties/Features.js
+++ b/app/imports/api/properties/Features.js
@@ -1,17 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 let FeatureSchema = new SimpleSchema({
 	name: {
 		type: String,
 	},
 	summary: {
 		type: String,
 		optional: true,
 	},
  description: {
 		type: String,
 		optional: true,
 	},
 });
 export { FeatureSchema }
--- a/app/imports/api/properties/Folders.js
+++ b/app/imports/api/properties/Folders.js
@@ -1,11 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 // Folders organize a character sheet into a tree, particularly to group things
 // like 'race' and 'background'
 let FolderSchema = new SimpleSchema({
  name: {
    type: String,
  },
 });
 export { FolderSchema };
--- a/app/imports/api/properties/Items.js
+++ b/app/imports/api/properties/Items.js
@@ -1,57 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 const ItemSchema = new SimpleSchema({
 	name: {
 		type: String,
 		optional: true,
 	},
 	// Plural name of the item, if there is more than one
 	plural: {
 		type: String,
 		optional: true,
 	},
 	description: {
 		type: String,
 		optional: true,
 	},
 	// Number currently held
 	quantity: {
 		type: SimpleSchema.Integer,
 		min: 0,
 		defaultValue: 1
 	},
 	// Weight per item in the stack
 	weight: {
 		type: Number,
 		min: 0,
    optional: true,
 	},
 	// Value per item in the stack, in gold pieces
 	value: {
 		type: Number,
 		min: 0,
    optional: true,
 	},
 	// If this item is equipped, it requires attunement
 	// Being equipped is `enabled === true`
 	requiresAttunement: {
 		type: Boolean,
 		optional: true,
 	},
  attuned: {
 		type: Boolean,
 		optional: true,
 	},
 	// Show increment/decrement buttons in item lists
 	showIncrement: {
 		type: Boolean,
 		optional: true,
 	},
 	// Unequipped items shouldn't affect creature stats
 	equipped: {
 		type: Boolean,
 		defaultValue: false,
 	},
 });
 export { ItemSchema };
--- a/app/imports/api/properties/Notes.js
+++ b/app/imports/api/properties/Notes.js
@@ -1,14 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 let NoteSchema = new SimpleSchema({
 	name: {
 		type: String,
 		optional: true,
 	},
 	description: {
 		type: String,
 		optional: true,
 	},
 });
 export { NoteSchema };
--- a/app/imports/api/properties/Proficiencies.js
+++ b/app/imports/api/properties/Proficiencies.js
@@ -1,24 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 let ProficiencySchema = new SimpleSchema({
 	name: {
 		type: String,
 		optional: true,
 	},
 	// The variableNames of the skills, tags, or attributes to apply proficiency to
 	stats: {
 		type: Array,
 		defaultValue: [],
 	},
 	'stats.$': {
 		type: String,
 	},
 	// A number representing how proficient the character is
 	value: {
 		type: Number,
 		allowedValues: [0.5, 1, 2],
 		defaultValue: 1,
 	},
 });
 export { ProficiencySchema };
--- a/app/imports/api/properties/Rolls.js
+++ b/app/imports/api/properties/Rolls.js
@@ -1,38 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 /**
 * Rolls are children to actions or other rolls, they are triggered with 0 or
 * more targets and then apply their results to the character taking the action
 * or the target of the action.
 *
 * # Rolls are resolved in one of two ways:
 * Regular rolls:
 * The target number is computed in the target's context
 * The roll is computed in the action taker's context
 * If the roll meets or exceeds the target number, the adjustments and buffs
 * are applied
 *
 * Saving throws:
 * The target number is computed in the action taker's context
 * The roll is computed in the target's context
 * If the roll fails to meet or exceed the target number, the adjustments and
 *  child rolls are applied
 */
 let RollSchema = new SimpleSchema({
  // The roll, can be simplified, but only computed in context
  roll: {
    type: String,
    optional: true,
  },
  // Effects can apply to this tag specifically
  // Ranged spell attack, Ranged weapon attack, etc.
  tags: {
    type: Array,
    defaultValue: [],
  },
  'tags.$': {
    type: String,
  },
 });
 export { RollSchema };
--- a/app/imports/api/properties/SavingThrows.js
+++ b/app/imports/api/properties/SavingThrows.js
@@ -1,40 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js';
 // These are the rolls made when saves are called for
 // For the saving throw bonus or proficiency, see ./Skills.js
 let SavingThrowSchema = new SimpleSchema ({
  name: {
    type: String,
    optional: true,
  },
  dc: {
    type: String,
    optional: true,
  },
  // The variable name of ability the save to roll
  stat: {
    type: String,
    optional: true,
  },
 });
 const ComputedOnlySavingThrowSchema = new SimpleSchema({
  dcResult: {
    type: Number,
    optional: true,
  },
  dcErrors: {
    type: Array,
    optional: true,
  },
  'dcErrors.$':{
    type: ErrorSchema,
  },
 });
 const ComputedSavingThrowSchema = new SimpleSchema()
  .extend(SavingThrowSchema)
  .extend(ComputedOnlySavingThrowSchema);
 export { SavingThrowSchema, ComputedOnlySavingThrowSchema, ComputedSavingThrowSchema };
--- a/app/imports/api/properties/Skills.js
+++ b/app/imports/api/properties/Skills.js
@@ -1,130 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js';
 import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js';
 /*
 * Skills are anything that results in a modifier to be added to a D20
 * Skills have an ability score modifier that they use as their basis
 */
 let SkillSchema = new SimpleSchema({
  name: {
 		type: String,
 		optional: true,
 	},
  // The technical, lowercase, single-word name used in formulae
  // Ignored for skilltype = save
  variableName: {
    type: String,
    regEx: VARIABLE_NAME_REGEX,
    min: 2,
  },
 	// The variable name of the ability this skill relies on
  ability: {
    type: String,
    optional: true,
  },
 	// What type of skill is this
  skillType: {
    type: String,
    allowedValues: [
      'skill',
      'save',
 			'check',
      'tool',
      'weapon',
      'armor',
      'language',
 			'utility', //not displayed anywhere
    ],
    defaultValue: 'skill',
  },
  // The starting value, before effects
 	baseValueCalculation: {
 		type: String,
 		optional: true,
 	},
 	// The base proficiency of this skill
 	baseProficiency: {
 		type: Number,
 		optional: true,
 	},
  // Description of what the skill is used for
  description: {
 		type: String,
 		optional: true,
 	},
 });
 let ComputedOnlySkillSchema = new SimpleSchema({
 	// Computed value of skill to be added to skill rolls
  value: {
    type: Number,
 		defaultValue: 0,
  },
  // The result of baseValueCalculation
  baseValue: {
    type: SimpleSchema.oneOf(Number, String, Boolean),
    optional: true,
  },
  baseValueErrors: {
    type: Array,
    optional: true,
  },
  'baseValueErrors.$': {
    type: ErrorSchema,
  },
 	// Computed value added by the ability
 	abilityMod: {
 		type: SimpleSchema.Integer,
 		optional: true,
 	},
 	// Computed advantage/disadvantage
  advantage: {
    type: SimpleSchema.Integer,
    optional: true,
    allowedValues: [-1, 0, 1],
  },
 	// Computed bonus to passive checks
  passiveBonus: {
    type: Number,
    optional: true,
  },
 	// Computed proficiency multiplier
  proficiency: {
    type: Number,
    allowedValues: [0, 0.5, 1, 2],
 		defaultValue: 0,
  },
  // Compiled text of all conditional benefits
  conditionalBenefits: {
    type: Array,
    optional: true,
  },
  'conditionalBenefits.$': {
    type: String,
  },
  // Compiled text of all roll bonuses
  rollBonuses: {
    type: Array,
    optional: true,
  },
  'rollBonuses.$': {
    type: String,
  },
 	// Computed number of things forcing this skill to fail
  fail: {
    type: SimpleSchema.Integer,
    optional: true,
  },
  // Should this attribute hide
  hide: {
    type: Boolean,
    optional: true,
  },
 })
 const ComputedSkillSchema = new SimpleSchema()
  .extend(ComputedOnlySkillSchema)
  .extend(SkillSchema);
 export { SkillSchema, ComputedSkillSchema, ComputedOnlySkillSchema };
--- a/app/imports/api/properties/SlotFillers.js
+++ b/app/imports/api/properties/SlotFillers.js
@@ -1,38 +0,0 @@
 // SlotFiller fillers specifically fill a slot with a bit more control than
 // other properties
 import SimpleSchema from 'simpl-schema';
 let SlotFillerSchema = new SimpleSchema({
  name: {
    type: String,
    optional: true,
  },
  picture: {
    type: String,
    optional: true,
  },
  description: {
    type: String,
    optional: true,
  },
  // Overrides the type when searching for properties
  slotFillerType: {
    type: String,
    optional: true,
  },
  // Fill more than one quantity in a slot, like feats and ability score
  // improvements, filtered out of UI if there isn't space in quantityExpected
  slotQuantityFilled: {
    type: SimpleSchema.Integer,
    defaultValue: 1,
    min: 0,
  },
  // Filters out of UI if condition isn't met, but isn't otherwise enforced
  slotFillerCondition: {
    type: String,
    optional: true,
  },
 });
 export { SlotFillerSchema };
--- a/app/imports/api/properties/Slots.js
+++ b/app/imports/api/properties/Slots.js
@@ -1,71 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js';
 let SlotSchema = new SimpleSchema({
  name: {
    type: String,
    optional: true,
  },
  description: {
    type: String,
    optional: true,
  },
  slotType: {
    type: String,
    optional: true,
  },
 	slotTags: {
    type: Array,
 		defaultValue: [],
  },
 	'slotTags.$': {
 		type: String,
 	},
  quantityExpected: {
    type: SimpleSchema.Integer,
    defaultValue: 1,
    min: 0,
  },
  ignored: {
    type: Boolean,
    optional: true,
  },
  slotCondition: {
    type: String,
    optional: true,
  },
  hideWhenFull: {
    type: Boolean,
    optional: true,
  }
 });
 const ComputedOnlySlotSchema = new SimpleSchema({
 	// The computed result of the effect
 	slotConditionResult: {
 		type: SimpleSchema.oneOf(Number, String, Boolean),
 		optional: true,
 	},
  // The errors encountered while computing the result
  slotConditionErrors: {
    type: Array,
    optional: true,
  },
  'slotConditionErrors.$':{
    type: ErrorSchema,
  },
  totalFilled: {
    type: SimpleSchema.Integer,
    defaultValue: 0,
  },
  spaceLeft: {
    type: SimpleSchema.Integer,
    optional: true,
  },
 });
 const ComputedSlotSchema = new SimpleSchema()
 	.extend(ComputedOnlySlotSchema)
 	.extend(SlotSchema);
 export { SlotSchema, ComputedSlotSchema, ComputedOnlySlotSchema };
--- a/app/imports/api/properties/SpellLists.js
+++ b/app/imports/api/properties/SpellLists.js
@@ -1,45 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js';
 import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js';
 let SpellListSchema = new SimpleSchema({
 	name: {
 		type: String,
 		optional: true,
 	},
 	description: {
 		type: String,
 		optional: true,
 	},
  variableName: {
    type: String,
 		regEx: VARIABLE_NAME_REGEX,
    min: 2,
    optional: true,
  },
 	// Calculation of how many spells in this list can be prepared
 	maxPrepared: {
 		type: String,
 		optional: true,
 	},
 });
 const ComputedOnlySpellListSchema = new SimpleSchema({
  maxPreparedResult: {
    type: Number,
    optional: true,
  },
  maxPreparedErrors: {
    type: Array,
    optional: true,
  },
  'maxPreparedErrors.$':{
    type: ErrorSchema,
  },
 });
 const ComputedSpellListSchema = new SimpleSchema()
  .extend(SpellListSchema)
  .extend(ComputedOnlySpellListSchema);
 export { SpellListSchema, ComputedOnlySpellListSchema, ComputedSpellListSchema };
--- a/app/imports/api/properties/Spells.js
+++ b/app/imports/api/properties/Spells.js
@@ -1,100 +0,0 @@
 import { ActionSchema, ComputedOnlyActionSchema } from '/imports/api/properties/Actions.js';
 import SimpleSchema from 'simpl-schema';
 import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js';
 const magicSchools = [
 	'abjuration',
 	'conjuration',
 	'divination',
 	'enchantment',
 	'evocation',
 	'illusion',
 	'necromancy',
 	'transmutation',
 ];
 let SpellSchema = new SimpleSchema({})
 .extend(ActionSchema)
 .extend({
 	name: {
 		type: String,
 		optional: true,
 	},
 	// If it's always prepared, it doesn't count against the number of spells
 	// prepared in a spell list, and enabled should be true
 	alwaysPrepared: {
 		type: Boolean,
 		optional: true,
 	},
  prepared: {
 		type: Boolean,
 		optional: true,
 	},
  // This spell ignores spell slot rules
  castWithoutSpellSlots: {
    type: Boolean,
    optional: true,
  },
  hasAttackRoll: {
    type: Boolean,
    optional: true,
  },
 	description: {
 		type: String,
 		optional: true,
 	},
 	castingTime: {
 		type: String,
 		optional: true,
 		defaultValue: 'action',
 	},
 	range: {
 		type: String,
 		optional: true,
 	},
 	duration: {
 		type: String,
 		optional: true,
 		defaultValue: 'Instantaneous',
 	},
 	verbal: {
 		type: Boolean,
 		optional: true,
 	},
 	somatic: {
 		type: Boolean,
 		optional: true,
 	},
 	concentration: {
 		type: Boolean,
 		optional: true,
 	},
 	material: {
 		type: String,
 		optional: true,
 	},
 	ritual: {
 		type: Boolean,
 		optional: true,
 	},
 	level: {
 		type: SimpleSchema.Integer,
 		defaultValue: 1,
 		max: 9,
 		min: 0,
 	},
 	school: {
 		type: String,
 		defaultValue: 'abjuration',
 		allowedValues: magicSchools,
 	},
 });
 const ComputedOnlySpellSchema = new SimpleSchema()
  .extend(ComputedOnlyActionSchema);
 const ComputedSpellSchema = new SimpleSchema()
  .extend(SpellSchema)
  .extend(ComputedOnlySpellSchema);
 export { SpellSchema, ComputedOnlySpellSchema, ComputedSpellSchema };
--- a/app/imports/api/properties/Toggles.js
+++ b/app/imports/api/properties/Toggles.js
@@ -1,45 +0,0 @@
 import SimpleSchema from 'simpl-schema';
 import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js';
 const ToggleSchema = new SimpleSchema({
  name: {
    type: String,
    optional: true,
  },
  disabled: {
    type: Boolean,
    optional: true,
  },
  enabled: {
    type: Boolean,
    optional: true,
  },
  // if neither disabled or enabled, the condition will be run to determine
  // if the children of the toggle should be active
  condition: {
    type: String,
    optional: true,
  },
 });
 const ComputedOnlyToggleSchema = new SimpleSchema({
 	// The computed result of the effect
 	toggleResult: {
 		type: Boolean,
 		optional: true,
 	},
  // The errors encountered while computing the result
  errors: {
    type: Array,
    optional: true,
  },
  'errors.$': {
    type: ErrorSchema,
  },
 });
 const ComputedToggleSchema = new SimpleSchema()
 	.extend(ComputedOnlyToggleSchema)
 	.extend(ToggleSchema);
 export { ToggleSchema, ComputedOnlyToggleSchema, ComputedToggleSchema };
--- a/Show More
+++ b/Show More