Merge remote-tracking branch 'upstream/dev-Tomcat' into dev-Tomcat

.editorconfig

@@ -9,4 +9,4 @@ indent_size = 4
 trim_trailing_whitespace = true
 
 [*.md]
-trim_trailing_whitespace = false
+trim_trailing_whitespace = false

.github/ISSUE_TEMPLATE.md

@@ -1,24 +1,53 @@
-**Arma 3 Version:** `x.xx` (stable / rc / dev)
-**CBA Version:** `3.x.x` (stable / dev + commit hash)
-**ACE3 Version:** `3.x.x` (stable / dev + commit hash)
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+---
 
-**Mods:**
-```
-- CBA_A3
-- ace
-```
+<!--
+🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨
+
+I ACKNOWLEDGE THE FOLLOWING BEFORE PROCEEDING:
+1. If I delete this entire template or parts of it and go my own path, the team may close my issue without further explanation or engagement.
+2. If I list multiple bugs/concerns in this one issue, the team may close my issue without further explanation or engagement.
+3. If I write an issue that has duplicates, the team may close my issue without further explanation or engagement (and without necessarily spending time to find the exact duplicate ID number).
+4. If I leave the title incomplete when filing the issue, the team may close my issue without further explanation or engagement.
+5. If I file something completely blank in the body, the team may close my issue without further explanation or engagement.
+6. If I file an issue without collecting logs (RPT file, etc...), the team may close my issue without further explanation or engagement. 
+
+All good? Then proceed and fill out all items below.
+-->
+
+**Modlist and KAT Version will be auto extracted from your attached RPT**
+Make sure to attach it to this report!
+
+**CBA Settings**
+<!-- Add a export of your relevant CBA settings here (ACE Medical and all KAT related settings). Go to addon options, server or missions tab and then click export to copy them to your clipboard. -->
+<details>
+  <summary>CBA Settings</summary>
+
+  ```sqf
+  Paste your settings in here.
+  ```  
+</details>
 
 **Description:**
-- Add a detailed description of the error. This makes it easier for me to fix the issue.
+- Add a detailed description of the error. This makes it easier for us to fix the issue. If applicable, add screenshots to help explain your problem (simply copy and paste). 
 
 **Steps to reproduce:**
-- Add the steps needed to reproduce the issue.
+Add the steps needed to reproduce the issue.
+
+1. _Go to ..._
+2. _Click ..._
+3. _See ..._
 
 **Where did the issue occur?**
 - Dedicated / Self-Hosted Multiplayer / Singleplayer / Editor (Singleplayer) / Editor (Multiplayer) / Virtual Arsenal
 
-**Placed Modules:**
-- Add the list of modules you have placed on the map. Use 'None' if the error occurs without any modules.
+**Additional information:**
+Provide any additional information that will help us solve this issue.
 
 **RPT log file:**
-- Add a link ([gist](https://gist.github.com) or [pastebin](http://pastebin.com)) to the client and/or server RPT file. An instruction to find your RPT files can be found [here](https://community.bistudio.com/wiki/Crash_Files#Arma_3).
+- Attach your RPT log file as a txt file. It can be found in `C:\Users\YOURUSERNAME\AppData\Local\Arma 3` and then add `.txt` to the end of the filename. Detailed instructions to find your RPT files can be found [here](https://community.bistudio.com/wiki/Crash_Files#Arma_3).

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,8 @@
 **When merged this pull request will:**
-- Describe what this pull request will do
-- Each change in a separate line
-- Include documentation if applicable
+- _Describe what this pull request will do_
+- _Each change in a separate line_
+
+### IMPORTANT
+
+- [Development Guidelines](https://ace3.acemod.org/wiki/development/) are read, understood and applied.
+- Title of this PR uses our standard template `Component - Add|Fix|Improve|Change|Make|Remove {changes}`.

.github/release-drafter.yml

@@ -0,0 +1,43 @@
+branches:
+  - master
+  - release-drafter  # for testing edits to this configuration
+
+name-template: 'Version $NEXT_PATCH_VERSION'
+tag-template: 'v$NEXT_PATCH_VERSION'
+
+categories:
+  - title: '**ADDED:**'
+    labels:
+      - 'kind/feature request'
+      - 'kind/added feature'
+  - title: '**FIXED:**'
+    labels:
+      - 'kind/bug fix'
+  - title: '**IMPROVED:**'
+    labels:
+      - 'kind/enhancement'
+      - 'kind/optimization'
+  - title: '**CHANGED:**'
+    labels:
+      - 'kind/cleanup'
+      - 'area/compatibility'
+  - title: '**TRANSLATIONS:**'
+    labels:
+      - 'area/translations'
+
+exclude-labels:
+  - 'ignore changelog'
+  - 'dependencies'
+
+change-template: '- $TITLE (#$NUMBER)'
+template: |
+  _Requires CBA version X.Y.Z or later and Arma 3 version X.Y or later._
+
+  ## Change Log Summary
+
+  $CHANGES
+
+replacers:
+  # Category titles
+  - search: '/\#\# (\*\*(ADDED|FIXED|IMPROVED|CHANGED|TRANSLATIONS):\*\*)/g'
+    replace: '$1'

.github/workflows/arma.yml

@@ -29,3 +29,19 @@ jobs:
     - name: Lint (sqflint)
       uses: arma-actions/sqflint@master
       continue-on-error: true # No failure due to many false-positives
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 1
+      - name: Setup HEMTT
+        uses: arma-actions/hemtt@v1
+      - name: Run HEMTT Build
+        run: hemtt release
+      - name: Upload Release
+        uses: actions/upload-artifact@v2
+        with:
+          name: '@kat'
+          path: '.hemttout/release/*'

.github/workflows/dev.yml

@@ -0,0 +1,46 @@
+name: Dev Release
+
+on:
+  release:
+    types: prereleased
+
+permissions:
+  contents: write
+
+jobs:
+  release-addon:
+    runs-on: ubuntu-latest
+    steps:
+        - name: Set VERSION env
+          run: echo VERSION=${GITHUB_REF:11} >> $GITHUB_ENV
+        - name: Checkout the source code
+          uses: actions/checkout@v2
+        - name: Setup HEMTT
+          uses: arma-actions/hemtt@v1
+        - name: Run HEMTT build
+          run: hemtt release --no-archive
+        - name: Move release to releases folder
+          run:
+            version="${{ github.event.release.tag_name }}"
+            mv .hemttout/release "@Kat-Advanced-Medical-${{ env.VERSION }}"
+        - name: Zip release
+          run: zip -r "@Kat-Advanced-Medical-${{ env.VERSION }}.zip" ./@Kat-Advanced-Medical-${{ env.VERSION }}
+        - name: Update Release with Files
+          uses: softprops/action-gh-release@v1
+          with:
+            files: ./@Kat-Advanced-Medical-${{ env.VERSION }}.zip
+            draft: true
+          env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        - name: Update to Steam Workshop (dev)
+          uses: arma-actions/workshop-upload@v1
+          with:
+            itemId: '2774641073'
+            contentPath: './@Kat-Advanced-Medical-${{ env.VERSION }}'
+            changelog: |
+              https://github.com/KAT-Advanced-Medical/KAM/releases/tag/v${{ env.VERSION }}
+
+              ${{ github.event.release.body }}
+          env:
+            STEAM_USERNAME: ${{ secrets.STEAM_USERNAME }}
+            STEAM_PASSWORD: ${{ secrets.STEAM_PASSWORD }}

.github/workflows/documentation.yml

@@ -0,0 +1,34 @@
+name: Documentation
+
+on:
+  push:
+    branches:
+    - dev-Tomcat
+
+jobs:
+  update:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout the source code
+      uses: actions/checkout@v3
+    - name: Install Python packages
+      run: |
+        pip3 install wheel
+        pip3 install setuptools
+        pip3 install pygithub
+        pip3 install pygithub3
+    - name: Update Translation issue
+      if: github.repository == 'KAT-Advanced-Medical/KAM' && ! contains(github.event.head_commit.message, '[ci skip]')
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: python3 tools/deploy.py
+
+  draft:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Release Drafter
+        if: github.repository == 'KAT-Advanced-Medical/KAM'
+        uses: release-drafter/release-drafter@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+

.github/workflows/extract-data-and-update-issue.yml

@@ -0,0 +1,34 @@
+name: Extract Data from Appended File and Update Issue
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  extract-data-and-update-issue:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Extract Data
+        run: |
+          set -x
+          # Get the issue number
+          ISSUE_NUMBER=$(echo "${{ github.event.issue.number }}")
+          # Get the contents of the appended file
+          # Get the URL of the first file linked in the issue
+          FILE_URL=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" "${{ github.api_url }}/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}" | jq -r '.body | match("(?i)https://github.com/[^/]+/[^/]+/files/[0-9]+/[^)]+") | .string' | grep -i '\.txt$')
+          # Download the file
+          APPENDED_FILE_CONTENTS=$(curl -s -L -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" "$FILE_URL" | tee /dev/stderr)
+          # Parse the contents of the appended file to extract the required data
+          Arma_Version=$(echo "$APPENDED_FILE_CONTENTS" | awk '/^Type:/{t=$0} /^Build:/{b=$0} /^Version:/{print t"\n"b"\n"$0}' | grep -oP '\d+\.\d+\.\d+')
+          ACE_Version=$(echo "$APPENDED_FILE_CONTENTS" | grep -oP 'Advanced Combat Environment \K\d+\.\d+\.\d+')
+          CBA_Version=$(echo "$APPENDED_FILE_CONTENTS" | grep -oP 'Community Base Addons v\K\d+\.\d+\.\d+')
+          KAT_Version=$(echo "$APPENDED_FILE_CONTENTS" | grep -oP 'kat_main\.pbo - \K\d+\.\d+\.\d+\.\d+')
+          Modlist=$(echo "$APPENDED_FILE_CONTENTS" | sed -n '/----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------/,/==========================================================================================================================================================================================================/ {/----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------/!{/==========================================================================================================================================================================================================/!p}}' | sed 's/^[0-9]\{2\}:[0-9]\{2\}:[0-9]\{2\}//' | awk -F '|' '{print $1}')
+          # Remove all @ symbols from the modlist so we don't tag people
+          Modlist=$(echo "$Modlist" | sed 's/@//g')
+          # Construct the comment body
+          comment_body="Arma Version: $Arma_Version<br> ACE Version: $ACE_Version<br> CBA Version: $CBA_Version<br> KAT Version: $KAT_Version <br> <details> <summary>Modlist</summary> $Modlist </details>"
+          # Add a comment to the opened issue using jq to escape the JSON data
+          curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -X POST "$GITHUB_API_URL/repos/$GITHUB_REPOSITORY/issues/$ISSUE_NUMBER/comments" -H "Accept: application/vnd.github+json" -d "$(jq -n --arg body "$comment_body" '{body: $body}')"

.github/workflows/release.yml

@@ -0,0 +1,58 @@
+name: Release
+
+on:
+  release:
+    types: released
+
+permissions:
+  contents: write
+
+jobs:
+  release-addon:
+    runs-on: ubuntu-latest
+    steps:
+        - name: Set VERSION env
+          run: echo VERSION=${GITHUB_REF:11} >> $GITHUB_ENV
+        - name: Checkout the source code
+          uses: actions/checkout@v2
+        - name: Setup HEMTT
+          uses: arma-actions/hemtt@v1
+        - name: Run HEMTT build
+          run: hemtt release --no-archive
+        - name: Move release to releases folder
+          run:
+            version="${{ github.event.release.tag_name }}"
+            mv .hemttout/release "@Kat-Advanced-Medical-${{ env.VERSION }}"
+        - name: Zip release
+          run: zip -r "@Kat-Advanced-Medical-${{ env.VERSION }}.zip" ./@Kat-Advanced-Medical-${{ env.VERSION }}
+        - name: Update Release with Files
+          uses: softprops/action-gh-release@v1
+          with:
+            files: ./@Kat-Advanced-Medical-${{ env.VERSION }}.zip
+            draft: true
+          env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        - name: Update to Steam Workshop (stable)
+          uses: arma-actions/workshop-upload@v1
+          with:
+            itemId: '2020940806'
+            contentPath: './@Kat-Advanced-Medical-${{ env.VERSION }}'
+            changelog: |
+              https://github.com/KAT-Advanced-Medical/KAM/releases/tag/v${{ env.VERSION }}
+
+              ${{ github.event.release.body }}
+          env:
+            STEAM_USERNAME: ${{ secrets.STEAM_USERNAME }}
+            STEAM_PASSWORD: ${{ secrets.STEAM_PASSWORD }}
+        - name: Update to Steam Workshop (dev)
+          uses: arma-actions/workshop-upload@v1
+          with:
+            itemId: '2774641073'
+            contentPath: './@Kat-Advanced-Medical-${{ env.VERSION }}'
+            changelog: |
+              https://github.com/KAT-Advanced-Medical/KAM/releases/tag/v${{ env.VERSION }}
+
+              ${{ github.event.release.body }}
+          env:
+            STEAM_USERNAME: ${{ secrets.STEAM_USERNAME }}
+            STEAM_PASSWORD: ${{ secrets.STEAM_PASSWORD }}

.gitignore

@@ -76,6 +76,11 @@ Thumbs.db
 releases/*
 keys/*
 .hemtt/local
+.hemttout
 ####
 hemtt.exe
 ArmaScriptCompiler.exe
+
+#SQF-VM Server
+.vscode\sqfvm-lsp
+.vscode

.hemtt/project.toml

@@ -0,0 +1,53 @@
+name = "KAM"
+prefix = "kat"
+author = "Katalam, Tomcat, Kygan, YetheSamartaka, Battlekeeper, MJSTIC, Digii / Julian and MiszczuZPolski"
+mainprefix = "x"
+
+#modname = "{{prefix}}_mods"
+#key_name = "{{prefix}}_{{version}}"
+#authority = "{{prefix}}_{{version}}"
+
+[files]
+include = [
+    "mod.cpp",
+    "README.md",
+    "LICENSE.md",
+    "KAMLogoLowRes.paa",
+    "KAMLogoHighRes.paa",
+    "AUTHORS.txt"
+]
+
+[version]
+git_hash = 0
+
+#[properties]
+#version = "{{git \"id 8\"}}"
+
+[lint.sqf]
+enabled = true # Default: true
+exclude = [
+    "a3/3DEN/UI/macroexecs.inc",
+    "a3/ui_f/hpp/defineResincl.inc",
+    "a3/ui_f/hpp/defineDIKCodes.inc",
+    "a3/ui_f/hpp/defineCommonGrids.inc",
+    "a3/ui_f/hpp/defineCommonColors.inc",
+]
+
+
+
+[asc]
+enabled = true
+exclude = [
+    "/initsettings.sqf",
+    "/initkeybinds.sqf",
+    "/xeh_prep.sqf"
+]
+
+[hemtt.config]
+preset = "Hemtt"
+
+[hemtt.launch]
+workshop = [
+    "450814997", # CBA_A3's Workshop ID
+    "463939057", # ACE3's Workshop ID
+]