diff --git a/app/imports/api/creature/creatures/methods/restCreature.js b/app/imports/api/creature/creatures/methods/restCreature.js index 7e7edb1e..bb351c03 100644 --- a/app/imports/api/creature/creatures/methods/restCreature.js +++ b/app/imports/api/creature/creatures/methods/restCreature.js @@ -83,13 +83,13 @@ export function resetProperties(creatureId, resetFilter, actionContext) { const attributeFilter = { ...filter, type: 'attribute', - damage: { $ne: 0 }, + damage: { $nin: [0, undefined] }, } CreatureProperties.find(attributeFilter).forEach(prop => { damagePropertyWork({ prop, operation: 'increment', - value: -prop.damage, + value: -prop.damage ?? 0, actionContext, logFunction(increment) { actionContext.addLog({ @@ -105,7 +105,7 @@ export function resetProperties(creatureId, resetFilter, actionContext) { type: { $in: ['action', 'spell'] }, - usesUsed: { $ne: 0 }, + usesUsed: { $nin: [0, undefined] }, }; CreatureProperties.find(actionFilter, { fields: { name: 1, usesUsed: 1 } diff --git a/app/imports/client/ui/components/ColumnLayout.vue b/app/imports/client/ui/components/ColumnLayout.vue index 8d3fc918..c3bda533 100644 --- a/app/imports/client/ui/components/ColumnLayout.vue +++ b/app/imports/client/ui/components/ColumnLayout.vue @@ -39,17 +39,6 @@ export default { .column-layout>div, .column-layout>span>div { - /* - Table and width set because firefox does not support break-inside: avoid - */ - display: table; - table-layout: fixed; - width: 100%; - backface-visibility: hidden; - -webkit-backface-visibility: hidden; - transform: translateX(0); - -webkit-transform: translateX(0); - -webkit-column-break-inside: avoid; page-break-inside: avoid; break-inside: avoid; padding: 4px; diff --git a/app/imports/client/ui/components/global/DragHandle.vue b/app/imports/client/ui/components/global/DragHandle.vue index 8c06cc0f..7ec3b784 100644 --- a/app/imports/client/ui/components/global/DragHandle.vue +++ b/app/imports/client/ui/components/global/DragHandle.vue @@ -2,8 +2,8 @@ mdi-drag diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/ActionsTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/ActionsTab.vue index 4eb82fb7..13b5b4fa 100644 --- a/app/imports/client/ui/creature/character/characterSheetTabs/ActionsTab.vue +++ b/app/imports/client/ui/creature/character/characterSheetTabs/ActionsTab.vue @@ -61,6 +61,7 @@ export default { const folderIds = CreatureProperties.find({ 'ancestors.id': this.creatureId, type: 'folder', + groupStats: true, hideStatsGroup: true, removed: { $ne: true }, inactive: { $ne: true }, diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue index 5e4bda72..4a8a22ff 100644 --- a/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue +++ b/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue @@ -59,6 +59,7 @@ export default { const folderIds = CreatureProperties.find({ 'ancestors.id': this.creatureId, type: 'folder', + groupStats: true, hideStatsGroup: true, removed: { $ne: true }, inactive: { $ne: true }, diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue index 64eddd1b..b87f2dd9 100644 --- a/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue +++ b/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue @@ -145,6 +145,7 @@ export default { return CreatureProperties.find({ 'ancestors.id': this.creatureId, type: 'folder', + groupStats: true, hideStatsGroup: true, removed: { $ne: true }, inactive: { $ne: true }, diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue index d4834bb5..36502e54 100644 --- a/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue +++ b/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue @@ -63,6 +63,7 @@ export default { const folderIds = CreatureProperties.find({ 'ancestors.id': this.creatureId, type: 'folder', + groupStats: true, hideStatsGroup: true, removed: { $ne: true }, inactive: { $ne: true }, diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue index db5d3af3..549d742c 100644 --- a/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue +++ b/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue @@ -81,6 +81,7 @@ export default { return CreatureProperties.find({ 'ancestors.id': this.creatureId, type: 'folder', + groupStats: true, hideStatsGroup: true, removed: { $ne: true }, inactive: { $ne: true }, diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue index e751f8e8..7f350a16 100644 --- a/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue +++ b/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue @@ -427,10 +427,10 @@ const propertyHandlers = { folder(prop) { let skipChildren; let propPath = null; - if (prop.hideStatsGroup) { + if (prop.groupStats && prop.hideStatsGroup) { skipChildren = true; } - if (prop.tab === 'stats') { + if (prop.groupStats && prop.tab === 'stats') { propPath = ['folder', prop.location] } return { skipChildren, propPath } diff --git a/app/imports/client/ui/creature/creatureList/CreatureFolderHeader.vue b/app/imports/client/ui/creature/creatureList/CreatureFolderHeader.vue index 1b22dcdc..f7e9ff61 100644 --- a/app/imports/client/ui/creature/creatureList/CreatureFolderHeader.vue +++ b/app/imports/client/ui/creature/creatureList/CreatureFolderHeader.vue @@ -1,5 +1,5 @@