diff --git a/.eslintrc.yml b/.eslintrc.yml index f235f5a07..bf90719bf 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -1,68 +1,68 @@ --- env: - browser: true - es6: true + browser: true + es6: true extends: - - eslint:recommended - - plugin:@typescript-eslint/recommended - - eslint-config-prettier + - eslint:recommended + - plugin:@typescript-eslint/recommended + - eslint-config-prettier globals: - Atomics: readonly - SharedArrayBuffer: readonly - ItemSheet: readonly - game: readonly - mergeObject: readonly - CONFIG: writable - duplicate: readonly - "$": readonly - Tabs: readonly - Hooks: readonly - Items: readonly - loadTemplates: readonly - Combat: writable - canvas: readonly - ActorSheet: readonly - Actor: readonly - Actors: readonly - fetchSpell: readonly + Atomics: readonly + SharedArrayBuffer: readonly + ItemSheet: readonly + game: readonly + mergeObject: readonly + CONFIG: writable + duplicate: readonly + "$": readonly + Tabs: readonly + Hooks: readonly + Items: readonly + loadTemplates: readonly + Combat: writable + canvas: readonly + ActorSheet: readonly + Actor: readonly + Actors: readonly + fetchSpell: readonly parserOptions: - ecmaVersion: 2018 - sourceType: module + ecmaVersion: 2018 + sourceType: module rules: - prettier/prettier: error - no-restricted-syntax: 0 - no-new: 0 - no-underscore-dangle: 0 - no-console: 0 - class-methods-use-this: 0 - max-classes-per-file: 0 - prefer-destructuring: 0 - no-plusplus: 0 - no-undef: 0 - prefer-rest-params: 0 - "@typescript-eslint/explicit-module-boundary-types": - - error - - allowDirectConstAssertionInArrowFunctions: true - allowHigherOrderFunctions: true - allowTypedFunctionExpressions: true + prettier/prettier: error + no-restricted-syntax: 0 + no-new: 0 + no-underscore-dangle: 0 + no-console: 0 + class-methods-use-this: 0 + max-classes-per-file: 0 + prefer-destructuring: 0 + no-plusplus: 0 + no-undef: 0 + prefer-rest-params: 0 + "@typescript-eslint/explicit-module-boundary-types": + - error + - allowDirectConstAssertionInArrowFunctions: true + allowHigherOrderFunctions: true + allowTypedFunctionExpressions: true settings: - import/resolver: - node: - paths: - - src - - '' - - dist - extensions: - - ".js" - - ".jsx" - - ".ts" - - ".tsx" - - ".json" + import/resolver: + node: + paths: + - src + - '' + - dist + extensions: + - ".js" + - ".jsx" + - ".ts" + - ".tsx" + - ".json" plugins: - - prettier - - "@typescript-eslint" + - prettier + - "@typescript-eslint" overrides: - - files: tests/**/* - rules: - global-require: 'off' + - files: tests/**/* + rules: + global-require: 'off' parser: "@typescript-eslint/parser" diff --git a/.gitattributes b/.gitattributes index d6ed91adc..8ccf3136e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,10 @@ -*.db text \ No newline at end of file +# Autodetect text files +* text=auto eol=lf + +# Definitively text +*.db text + +# Definitively not text +*.jpg binary +*.png binary +*.pdf binary diff --git a/.mergify.yml b/.mergify.yml index 83ca5693d..a64b8f8b7 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -15,15 +15,15 @@ pull_request_rules: conditions: - conflict actions: - comment: - message: This pull request is now in conflicts. Could you fix it? 🙏 + comment: + message: This pull request is now in conflicts. Could you fix it? 🙏 - name: ask to fix commit message conditions: - status-failure=Semantic Pull Request - -closed actions: - comment: - message: | - Title does not follow the guidelines of [Conventional Commits](https://www.conventionalcommits.org). - Please adjust title before merge. + comment: + message: | + Title does not follow the guidelines of [Conventional Commits](https://www.conventionalcommits.org). + Please adjust title before merge. diff --git a/src/scripts/release.sh b/src/scripts/release.sh index 1273a8a3c..d3e95dc0f 100755 --- a/src/scripts/release.sh +++ b/src/scripts/release.sh @@ -1,8 +1,8 @@ -sed -i -e 's|\(.*"version"\): "\(.*\)",.*|\1: '"\"$1\",|" static/system.json \ -&& cp static/system.json dist \ -&& sed -i -e 's|\(.*"version"\): "\(.*\)",.*|\1: '"\"$1\",|" package.json \ -&& npm install \ -&& npm audit fix \ -&& cd dist || exit \ -&& zip -r twodsix.zip ./* \ -&& cd .. +sed -i -e 's|\(.*"version"\): "\(.*\)",.*|\1: '"\"$1\",|" static/system.json && + cp static/system.json dist && + sed -i -e 's|\(.*"version"\): "\(.*\)",.*|\1: '"\"$1\",|" package.json && + npm install && + npm audit fix && + cd dist || exit && + zip -r twodsix.zip ./* && + cd .. diff --git a/static/assets/actor/Profile-Block3b.svg b/static/assets/actor/Profile-Block3b.svg index 3733489ed..13fb23eca 100644 --- a/static/assets/actor/Profile-Block3b.svg +++ b/static/assets/actor/Profile-Block3b.svg @@ -1,21 +1,26 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/static/assets/actor/profile-block.svg b/static/assets/actor/profile-block.svg index 8c20acb18..61783b477 100644 --- a/static/assets/actor/profile-block.svg +++ b/static/assets/actor/profile-block.svg @@ -1,27 +1,31 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/static/assets/actor/psiblock1.svg b/static/assets/actor/psiblock1.svg index 56355313b..848f38e70 100644 --- a/static/assets/actor/psiblock1.svg +++ b/static/assets/actor/psiblock1.svg @@ -1,15 +1,17 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/static/assets/actor/statblock1.svg b/static/assets/actor/statblock1.svg index 529a622c8..88b2ffbe6 100644 --- a/static/assets/actor/statblock1.svg +++ b/static/assets/actor/statblock1.svg @@ -1,10 +1,11 @@ - - - - - - - + + + + + + + diff --git a/static/assets/actor/tabs-bg.svg b/static/assets/actor/tabs-bg.svg index c153c5753..e32c10563 100644 --- a/static/assets/actor/tabs-bg.svg +++ b/static/assets/actor/tabs-bg.svg @@ -1,10 +1,11 @@ - - - - - - - + + + + + + + diff --git a/static/templates/actors/parts/actor-info.html b/static/templates/actors/parts/actor-info.html index 9d2dba450..d4d1d3bf8 100644 --- a/static/templates/actors/parts/actor-info.html +++ b/static/templates/actors/parts/actor-info.html @@ -1,4 +1,4 @@
- {{editor content=data.details.description target="data.details.description" button=true owner=owner - editable=editable}} + {{editor content=data.details.description target="data.details.description" button=true owner=owner + editable=editable}}
diff --git a/static/templates/actors/parts/actor-ucf.html b/static/templates/actors/parts/actor-ucf.html index 14f6667ad..1954dbaa6 100644 --- a/static/templates/actors/parts/actor-ucf.html +++ b/static/templates/actors/parts/actor-ucf.html @@ -1,6 +1,6 @@
- + - {{!-- Sheet Header --}} -
- actor image -
-

-

-
- - -
- - {{!-- Sheet Body --}} -
- - - {{editor content=data.UCF target="data.UCF" button=true owner=owner editable=editable}} - {{editor content=actor.notes target="actor.notes" button=true owner=owner editable=editable}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + {{!-- Sheet Header --}} +
+ actor image +
+

+

+
+ + +
+ + {{!-- Sheet Body --}} +
+ + + {{editor content=data.UCF target="data.UCF" button=true owner=owner editable=editable}} + {{editor content=actor.notes target="actor.notes" button=true owner=owner editable=editable}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Skill (name:level)Attribute (name:level)Difficulties (Average:8, Hard:10, etc)Modifiers (-9:-9 to +9:+9, I guess)Time Increment (seconds:seconds, rounds, minutes, etc)Time Increment Modifier (-8:-8 to +8:+8, I guess)Tool/Weapon (name:value), where value is either ignored or a dice roll formula.
+ + + + + + + + + + + + + + + + + + +
Skill (name:level)Attribute (name:level)Difficulties (Average:8, Hard:10, etc)Modifiers (-9:-9 to +9:+9, I guess)Time Increment (seconds:seconds, rounds, minutes, etc)Time Increment Modifier (-8:-8 to +8:+8, I guess)Tool/Weapon (name:value), where value is either ignored or a dice roll formula.
+ + + {{#each data.skills as |skill|}} + + + + {{/each}} + +
+ +
+ 		+ + + {{#each data.characteristics as |characteristic|}} + + + + {{/each}} + +
+ + +
+ 		+ + + {{#each data.difficulties as |difficulty|}} + + - + {{/each}} + +
+ {{difficulty}}
+
+ 		+ + + {{#each data.modifiers as |modifier|}} + + + + {{/each}} + +
+ {{modifier}}
+
+ 		+ + + {{#each data.increments as |increment|}} + + + + {{/each}} + +
+ {{increment}}
+
+ 		+ - - - - - - - - + {{#each data.incrementmodifiers as |incrementmodifier|}} + + + {{/each}} -
- - - {{#each data.skills as |skill|}} - - - - {{/each}} - -
- -
- 		- - - {{#each data.characteristics as |characteristic|}} - - - - {{/each}} - -
- - -
- 		- - - {{#each data.difficulties as |difficulty|}} - - - - {{/each}} - -
- {{difficulty}}
-
- 		- - - {{#each data.modifiers as |modifier|}} - - - - {{/each}} - -
- {{modifier}}
-
- 		- - - {{#each data.increments as |increment|}} - - - - {{/each}} - -
- {{increment}}
-
- 		- - - {{#each data.incrementmodifiers as |incrementmodifier|}} - - - - {{/each}} - -
- {{incrementmodifier}}
-
- 		tools/weapons todo
+ {{incrementmodifier}}
+
- - normal
- advantage
- disadvantage
- - - - - - +
+ + tools/weapons todo + + + + + normal
+ advantage
+ disadvantage
+ + + + + +
diff --git a/static/templates/items/item-sheet.html b/static/templates/items/item-sheet.html index 6a01d55a0..adbab9b1a 100644 --- a/static/templates/items/item-sheet.html +++ b/static/templates/items/item-sheet.html @@ -1,41 +1,41 @@
-
- item image -
-

- -

-
-
- - -
-
- - -
-
+
+ item image +
+

+ +

+
+
+ +
-
+
+ + +
+
+ +
- {{!-- Sheet Tab Navigation --}} - + {{!-- Sheet Tab Navigation --}} + - {{!-- Sheet Body --}} -
+ {{!-- Sheet Body --}} +
- {{!-- Description Tab --}} -
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
+ {{!-- Description Tab --}} +
+ {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} +
- {{!-- Attributes Tab --}} -
- {{!-- As you add new fields, add them in here! --}} -
-
+ {{!-- Attributes Tab --}} +
+ {{!-- As you add new fields, add them in here! --}} +
+