Merge pull request #4 from Muttley/develop

Release 11.1.0

.editorconfig

@@ -0,0 +1,8 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = tab
+insert_final_newline = true
+trim_trailing_whitespace = true

.github/workflows/npm-gulp.yml

@@ -0,0 +1,29 @@
+name: NodeJS with Gulp
+
+on:
+  push:
+    branches: [ "develop" ]
+  pull_request:
+    branches: [ "develop" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [18.x]
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v3
+      with:
+        node-version: ${{ matrix.node-version }}
+
+    - name: Install Dependencies
+      run: npm ci
+
+    - name: Build
+      run: npm run build

.github/workflows/release.yml

@@ -0,0 +1,88 @@
+name: Create Release
+
+on:
+  push:
+    tags:
+      - 'release-*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [18.x]
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up variables
+      id: get_vars
+      run: |
+        TAG=${GITHUB_REF/refs\/tags\//}
+        echo ::set-output name=TAG_NAME::$TAG
+        echo ::set-output name=ZIP_NAME::ac2d20.zip
+        echo ::set-output name=RELEASE_DOWNLOAD_URL::https://github.com/${{github.repository}}/releases/latest/download/ac2d20.zip
+        echo ::set-output name=RELEASE_INSTALL_URL::https://github.com/${{github.repository}}/releases/download/$TAG/system.json
+        JSON=$(cat ./system/system.json)
+        echo ::set-output name=SYSTEM_JSON::${JSON//'%'/'%25'}
+
+    # Run some tests to make sure our `system.json` is correct
+    # Exit before setting up node if not
+    - name: Verify Naming
+      env:
+        TAG_NAME: ${{ steps.get_vars.outputs.TAG_NAME }}
+        RELEASE_DOWNLOAD: ${{steps.get_vars.outputs.RELEASE_DOWNLOAD_URL}}
+        # Extract version and download url from system.json
+        # https://docs.github.com/en/actions/learn-github-actions/expressions#fromjson
+        PACKAGE_VERSION: ${{fromJSON(steps.get_vars.outputs.SYSTEM_JSON).version}}
+        PACKAGE_DOWNLOAD: ${{fromJSON(steps.get_vars.outputs.SYSTEM_JSON).download}}
+      run: |
+        # Validate that the tag being released matches the package version.
+        if [[ ! $TAG_NAME == release-$PACKAGE_VERSION ]]; then
+          echo "The system.json version does not match tag name."
+          echo "system.json: $PACKAGE_VERSION"
+          echo "tag name: $TAG_NAME"
+          echo "Please fix this and push the tag again."
+          exit 1
+        fi
+
+        # Validate that the package download url matches the release asset that will be created.
+        if [[ ! $RELEASE_DOWNLOAD == $PACKAGE_DOWNLOAD ]]; then
+          echo "The system.json download url does not match the created release asset url."
+          echo "system.json: $PACKAGE_DOWNLOAD"
+          echo "release asset url: $RELEASE_DOWNLOAD"
+          echo "Please fix this and push the tag again."
+          exit 1
+        fi
+
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v3
+      with:
+        node-version: ${{ matrix.node-version }}
+        cache: 'npm'
+
+    - name: Install Dependencies
+      run: npm ci
+
+    - name: Build
+      run: |
+        npm run build
+        cp --force LICENSE.txt system/.
+        cp --force README.md system/.
+
+    - run: cd system && zip ../${{steps.get_vars.outputs.ZIP_NAME}} -r assets css fonts lang packs src templates ac2d20.mjs ac2d20-compiled.mjs ac2d20-compiled.mjs.map LICENSE.txt README.md system.json template.json
+
+    # Create a release for this specific version
+    - name: Update Release with Files
+      id: create_version_release
+      uses: ncipollo/release-action@v1
+      with:
+        allowUpdates: true # Set this to false if you want to prevent updating existing releases
+        name: ${{steps.get_vars.outputs.TAG_NAME}}
+        draft: false
+        prerelease: false
+        token: ${{ secrets.GITHUB_TOKEN }}
+        artifacts: './system/system.json, ./${{steps.get_vars.outputs.ZIP_NAME}}'
+        tag: ${{steps.get_vars.outputs.TAG_NAME}}
+        body: '**Installation:** To manually install this release, please use the following manifest URL: ${{steps.get_vars.outputs.RELEASE_INSTALL_URL}}'

.gitignore

@@ -1,21 +1,9 @@
-# IDE
-.idea/
-.vs/
-*.code-workspace
-
-# Node Modules
+.vscode/
 node_modules/
-npm-debug.log
-
-# Gulp
-gulpfile.js
-package-lock.json
-package.json
+scratch/
+system/css/
+system/i18n/
+system/packs/
 
-# Foundry
-*.lock
-
-# Releases and zips
-*.7z
-*.zip
-*.rar
+*.code-workspace
+ac2d20-compiled*

.vscode/extensions.json

@@ -0,0 +1,9 @@
+{
+    "recommendations": [
+        "EditorConfig.EditorConfig",
+        "dbaeumer.vscode-eslint",
+        "esbenp.prettier-vscode",
+        "Gruntfuggly.todo-tree",
+        "lokalise.i18n-ally"
+    ]
+}

.vscode/i18n-ally-custom-framework.yml

@@ -0,0 +1,39 @@
+# Author: FloRad from SWADE game system
+# https://gitlab.com/peginc/swade
+
+# .vscode/i18n-ally-custom-framework.yml
+
+# An array of strings which contain Language Ids defined by VS Code
+# You can check avaliable language ids here: https://code.visualstudio.com/docs/languages/overview#_language-id
+languageIds:
+  - javascript
+  - typescript
+  - handlebars
+
+# An array of RegExes to find the key usage. **The key should be captured in the first match group**.
+# You should unescape RegEx strings in order to fit in the YAML file
+# To help with this, you can use https://www.freeformatter.com/json-escape.html
+usageMatchRegex:
+  # The following example shows how to detect `t("your.i18n.keys")`
+  # the `{key}` will be placed by a proper keypath matching regex,
+  # you can ignore it and use your own matching rules as well
+  - "[^\\w\\d]game\\.i18n\\.localize\\(['\"`]({key})['\"`]\\)"
+  - "[^\\w\\d]game\\.i18n\\.format\\(['\"`]({key})['\"`]"
+  - "[^\\w\\d]ui\\.notifications\\.info\\(['\"`]({key})['\"`],\\s{\\s*.*\\slocalize: true\\s*.*}"
+  - "[^\\w\\d]ui\\.notifications\\.warn\\(['\"`]({key})['\"`],\\s{\\s*.*\\slocalize: true\\s*.*}"
+  - "[^\\w\\d]ui\\.notifications\\.error\\(['\"`]({key})['\"`],\\s{\\s*.*\\slocalize: true\\s*.*}"
+  - "\\{\\{\\s*localize\\s+[\"']({key})['\"]\\}\\}"
+  - "\\{\\{[\\w\\.\\s\\=]*\\(localize\\s+[\"']({key})['\"]\\)[\\w\\.\\s\\=]*\\}\\}"
+  - "name:\\s+[\"'](SETTINGS.{key})[\"']"
+  - "hint:\\s+[\"'](SETTINGS.{key})[\"']"
+
+# An array of strings containing refactor templates.
+# The "$1" will be replaced by the keypath specified.
+# Optional: uncomment the following two lines to use
+
+# refactorTemplates:
+#  - "{{localize '$1'}}"
+#  - '{{localize "$1"}}'
+
+# If set to true, only enables this custom framework (will disable all built-in frameworks)
+monopoly: true

.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+	// Use IntelliSense to learn about possible attributes.
+	// Hover to view descriptions of existing attributes.
+	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+	"version": "0.2.0",
+	"configurations": [
+		{
+			"type": "chrome",
+			"request": "launch",
+			"name": "Achtung! Cthulhu 2d20 System",
+			"url": "http://localhost:30000",
+			"webRoot": "${workspaceFolder}/system"
+		}
+	]
+}

.vscode/settings.json

@@ -1,15 +1,3 @@
 {
-    "liveSassCompile.settings.formats": [
-        {
-            "format": "expanded",
-            "extensionName": ".css",
-            "savePath": "/css",
-            //"savePath": "/src"
-        },
-    ],
-    "liveSassCompile.settings.autoprefix": null,
-    "liveSassCompile.settings.excludeList": [
-        "**/node_modules/**",
-        ".vscode/**"
-    ]
-}
+	"i18n-ally.localesPaths": "i18n"
+}

CHANGELOG.md

@@ -1,72 +1,71 @@
-# v11.0.2
+## v11.1.0
 
-- Initiative-Tracker Overhaul, brought to you by Muttley. 
+- System migrated to new home and build process
+- Compendiums now contained within a top-level system folder
+
+## v11.0.2
+
+- Initiative-Tracker Overhaul, brought to you by Muttley.
 (If you had Lancer mod for tracking initiative you can disable it since the system now handles initiative tracking)
 Also, check the settings where You can toggle Momentum decreasement at the end of the round.
 Many thanks to Muttley for sharing his initiative tracker modifications and spending his time to implement it.
 
-
-# v11.0.1
+## v11.0.1
 
 - Item Sheets now look in the skill compendium when creating list of skills and focuses in dropdowns.
 You can set what compendium to use for skills in AC2d20 settings
 
-# v11.0.0
+## v11.0.0
 
 - Foundry V11 compatible
 
-
-# v10.0.10
+## v10.0.10
 
 - Necessary changes to TextEnricher to support full async methods
 - Fixed Item to Chat button
 
-
-# v10.0.9
+## v10.0.9
 
 - Added option in the settings to point to your json file that contains custom **descriptions** for weapon's effects/qualities. (It is a way to override those descriptions like 'pg.99' .etc)
 
-# v10.0.8
+## v10.0.8
 
 - Added delete button to skills
 
-# v10.0.7
+## v10.0.7
 
 - Added text enrichers for AC2D20 special symbols like the small cthulhu head or the cross.
 Write the **Cthulhu Head Icon(symbol)** in texts by typing **@s** ot **@stress** or **@c** or **@challenge**
 Write the **The Cross symbol** in texts by typing **@x** or **@xross**
-
-# v10.0.6
+## v10.0.6
 
 - Fixed custom skill compendium usage
 
-# v10.0.5
+## v10.0.5
 
 - Added carry capacity autocalculation
 
-# v10.0.4
+## v10.0.4
 
 - Spellcasting types are now defined by Actor and not the spells. Traditional, Researcher and Dabbler are now set on the Character/NPC sheet under the "Spells" tab.
 
-# v10.0.3
+## v10.0.3
 
 - Fixed item qualities display in chat messages
-
-# v10.0.2
+## v10.0.2
 
 - Small changes to roller so it works with Maestro Module item tracks
 
-# v10.0.1
+## v10.0.1
 
 - Added Spanish translation (Thanks to Viajero Salvaje)
 
-# v10.0.0
+## v10.0.0
 
 - System is compatible with Foundry v10
 - Added Fatigue value to the character sheet
 
-
-# v 1.0.5
+## v 1.0.5
 
 Fixed bug with Personal Truths and Injuries on the Actor sheet.
 Due to the nature of the bug data model is changed and no migration is provided
@@ -85,24 +84,22 @@ console.log(act.data.data.truths)
 console.log("INJURIES")
 console.log(act.data.data.injuries.list)
 ```
-
-
-# v 1.0.4
+## v 1.0.4
 
 - Setting added: "Show GM Momentum To Player"
 - Setting added: "Players Can Setup Party's Max App"
 - Changed releases manifest and package.
 
-# v 1.0.3
+## v 1.0.3
 
 - Bumped version to v9
 - Changed the power on the spell tab so it only has a single numerical field
 - Creating new spells now leaves the focus field empty
 
-# v 1.0.2
+## v 1.0.2
 
 - Added Ritual fields for Spells.
 
-# v 1.0.1
+## v 1.0.1
 
 - Added two new weapon qualities found in GM guide. Bane and Hunger.