Spells that aren't prepared no longer count as active properties

This commit is contained in:
Stefan Zermatten
2020-08-21 16:34:52 +02:00
parent a6ed1004be
commit 46501f2759
2 changed files with 10 additions and 0 deletions

View File

@@ -6,12 +6,14 @@ export default function getActiveProperties({
filter = {},
options = {sort: {order: 1}},
includeUntoggled = false,
includeUnprepared = false,
excludeAncestors,
}){
filter = getActivePropertyFilter({
ancestorId,
filter,
includeUntoggled,
includeUnprepared,
excludeAncestors,
});
return CreatureProperties.find(filter, options).fetch();
@@ -21,6 +23,7 @@ export function getActivePropertyFilter({
ancestorId,
filter = {},
includeUntoggled = false,
includeUnprepared = false,
excludeAncestors = [],
}){
if (!ancestorId){
@@ -38,6 +41,12 @@ export function getActivePropertyFilter({
if (!includeUntoggled){
disabledAncestorsFilter.$or.push({toggleResult: false});
}
if (!includeUnprepared){
disabledAncestorsFilter.$or.push({
prepared: false,
alwaysPrepared: false
});
}
let disabledAncestorIds = CreatureProperties.find(disabledAncestorsFilter, {
fields: {_id: 1},
}).map(prop => prop._id);

View File

@@ -88,6 +88,7 @@ export default {
order: 1,
},
},
includeUnprepared: this.preparingSpells,
});
},
numPrepared(){