Merge branch 'dev_softlock' into dev

2022-01-14 16:46:01 +01:00
parent 4da28574ab f5c9745279
commit bb1176cf42
15 changed files with 51 additions and 42 deletions
--- a/system/scripts/actors/base-character-sheet.js
+++ b/system/scripts/actors/base-character-sheet.js
@@ -31,6 +31,9 @@ export class BaseCharacterSheetL5r5e extends BaseSheetL5r5e {
        // Split Items by types
        sheetData.data.splitItemsList = this._splitItems(sheetData);

+        // Shortcut for some tests
+        sheetData.data.editable_not_soft_locked = sheetData.editable && !sheetData.data.data.soft_locked;
+
        return sheetData;
    }