Fixed calculated toggles not hiding some props from the sheet

This commit is contained in:
Stefan Zermatten
2023-06-07 14:35:42 +02:00
parent e49dea469f
commit f7461f40d6
7 changed files with 9 additions and 1 deletions

View File

@@ -198,6 +198,7 @@ export default {
equipped: { $ne: true },
removed: { $ne: true },
deactivatedByAncestor: { $ne: true },
deactivatedByToggle: { $ne: true },
}, {
sort: { order: 1 },
});

View File

@@ -456,7 +456,7 @@ const propertyHandlers = {
},
toggle(prop) {
if (
prop.deactivatedByAncestor || !prop.showUI
prop.deactivatedByToggle || prop.deactivatedByAncestor || !prop.showUI
) return { propPath: null };
return { propPath: 'toggle' };
},
@@ -580,6 +580,7 @@ export default {
'ancestors.id': this.creatureId,
removed: { $ne: true },
deactivatedByAncestor: { $ne: true },
deactivatedByToggle: { $ne: true },
showUI: true,
}, {
sort: { order: 1 }

View File

@@ -152,6 +152,7 @@ export default {
removed: { $ne: true },
equipped: { $ne: true },
deactivatedByAncestor: { $ne: true },
deactivatedByToggle: { $ne: true },
}, {
sort: { order: 1 },
}).fetch();
@@ -168,6 +169,7 @@ export default {
equipped: { $ne: true },
removed: { $ne: true },
deactivatedByAncestor: { $ne: true },
deactivatedByToggle: { $ne: true },
}, {
sort: { order: 1 },
});

View File

@@ -450,6 +450,7 @@ export default {
type: 'toggle',
removed: { $ne: true },
deactivatedByAncestor: { $ne: true },
deactivatedByToggle: { $ne: true },
showUI: true,
}, {
sort: { order: 1 }

View File

@@ -49,6 +49,7 @@ export default {
type: 'toggle',
showUI: true,
deactivatedByAncestor: { $ne: true },
deactivatedByToggle: { $ne: true },
},
{
type: { $ne: 'toggle' },

View File

@@ -42,6 +42,7 @@ export default {
type: 'toggle',
showUI: true,
deactivatedByAncestor: { $ne: true },
deactivatedByToggle: { $ne: true },
},
{
type: { $ne: 'toggle' },

View File

@@ -99,6 +99,7 @@ export default {
removed: { $ne: true },
equipped: { $ne: true },
deactivatedByAncestor: { $ne: true },
deactivatedByToggle: { $ne: true },
}, {
sort: { order: 1 },
});