Merge branch 'KAT-Advanced-Medical:dev-Tomcat' into dev-Tomcat

Author: AtrixZockt

.github/release-drafter.yml

@@ -5,39 +5,44 @@ branches:
 name-template: 'Version $NEXT_PATCH_VERSION'
 tag-template: 'v$NEXT_PATCH_VERSION'
 
+sort-by: title # sort alphabetically
+sort-direction: ascending
+
 categories:
   - title: '**ADDED:**'
     labels:
-      - 'kind/feature request'
-      - 'kind/added feature'
+      - 'kind/feature'
   - title: '**FIXED:**'
     labels:
-      - 'kind/bug fix'
+      - 'kind/bug-fix'
   - title: '**IMPROVED:**'
     labels:
       - 'kind/enhancement'
       - 'kind/optimization'
   - title: '**CHANGED:**'
     labels:
       - 'kind/cleanup'
-      - 'area/compatibility'
+      - 'kind/change'
+  - title: '**SETTINGS:**'
+    labels:
+      - 'kind/setting'
   - title: '**TRANSLATIONS:**'
     labels:
-      - 'area/translations'
+      - 'kind/translation'
 
 exclude-labels:
-  - 'ignore changelog'
+  - 'ignore-changelog'
   - 'dependencies'
 
 change-template: '- $TITLE (#$NUMBER)'
 template: |
-  _Requires CBA version X.Y.Z or later and Arma 3 version X.Y or later._
+  _Requires CBA version X.Y.Z or later and ACE 3 version X.Y or later._
 
   ## Change Log Summary
 
   $CHANGES
 
 replacers:
   # Category titles
-  - search: '/\#\# (\*\*(ADDED|FIXED|IMPROVED|CHANGED|TRANSLATIONS):\*\*)/g'
-    replace: '$1'
+  - search: '/\#\# (\*\*(ADDED|FIXED|IMPROVED|CHANGED|SETTINGS|TRANSLATIONS):\*\*)/g'
+    replace: '$1'

.github/workflows/arma.yml

@@ -20,29 +20,28 @@ jobs:
       run: python3 tools/stringtable_validator.py
     - name: Check Strings
       run: python3 tools/check_strings.py
+    - name: Check for BOM
+      uses: arma-actions/bom-check@master
+      with:
+        path: 'addons'
 
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout the source code
-      uses: actions/checkout@v4
-    - 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@v4
-        with:
-          fetch-depth: 1
+      - name: Checkout the source code
+        uses: actions/checkout@v4
       - name: Setup HEMTT
         uses: arma-actions/hemtt@v1
+        with:
+          annotate: false
       - name: Run HEMTT Build
         run: hemtt build
+      - name: Rename build folder
+        run: mv .hemttout/build .hemttout/@kat
       - name: Upload Release
         uses: actions/upload-artifact@v4
         with:
-          name: '@kat'
-          path: '.hemttout/build/*'
+          name: 'kat-${{github.sha}}-nobin'
+          path: '.hemttout/@*'
           include-hidden-files: true # Because .hemttout is a hidden directory

.github/workflows/dev.yml

@@ -39,7 +39,6 @@ jobs:
             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 }}

.github/workflows/hemtt.yml

@@ -0,0 +1,39 @@
+name: HEMTT
+
+on:
+  push:
+    branches:
+    - master
+  pull_request_target:
+
+jobs:
+  windows:
+    runs-on: windows-latest
+    steps:
+    - name: Checkout the source code
+      uses: actions/checkout@v4
+    - name: Setup HEMTT
+      uses: arma-actions/hemtt@v1
+    - name: Checkout pull request
+      uses: actions/checkout@v4
+      if: ${{ github.event_name == 'pull_request_target' }}
+      with:
+        path: pullrequest
+        ref: 'refs/pull/${{ github.event.number }}/merge'
+    - name: Replace addons with pull request addons
+      if: ${{ github.event_name == 'pull_request_target' }}
+      run: |
+        rm -r addons\
+        rm -r include\
+        xcopy /e /h /q pullrequest\addons addons\
+        xcopy /e /h /q pullrequest\include include\
+    - name: Run HEMTT build
+      run: hemtt build
+    - name: Rename build folder
+      run: mv .hemttout/build .hemttout/@kat
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: kat-${{ github.sha }}
+        path: .hemttout/@*
+        include-hidden-files: true # Because .hemttout is a hidden directory

.hemtt/launch.toml

@@ -2,11 +2,18 @@
 workshop = [
     "450814997", # CBA_A3's Workshop ID
     "463939057", # ACE3's Workshop ID
-    "2369477168" # Advanced Developer Tools's Workshop ID
+    "3499977893" # Advanced Developer Tools's Workshop ID
 ]
 
 [rhs]
 extends = "default"
 workshop = [
     "843577117", # RHS USAF Workshop ID
 ]
+
+[anrop]
+workshop = [
+    "450814997", # CBA_A3's Workshop ID
+    "1882627645", # Anrop ACE3's Workshop ID
+    "3499977893" # Advanced Developer Tools's Workshop ID
+]

AUTHORS.txt

@@ -39,4 +39,6 @@ Nilia
 Eughenos
 Solbak
 Tapawingo
-apo_tle
+apo_tle
+Aaren
+Apricot_ale

addons/airway/CfgMoves.hpp

@@ -42,4 +42,4 @@ class CfgMovesMaleSdr: CfgMovesBasic {
             };
         };
     };
-};
+};

addons/airway/CfgVehicles.hpp

@@ -47,16 +47,13 @@ class CfgVehicles {
         hiddenSelectionsTextures[] = {QPATHTOF(ui\vomit.paa)};
     };
 
-    class NATO_Box_Base;
-    class ACE_medicalSupplyCrate: NATO_Box_Base {
-        class TransportItems;
-    };
+    class ACE_medicalSupplyCrate;
     class ACE_medicalSupplyCrate_advanced: ACE_medicalSupplyCrate {
-        class TransportItems: TransportItems {
+        class TransportItems {
             MACRO_ADDITEM(kat_larynx,15);
             MACRO_ADDITEM(kat_guedel,15);
-            MACRO_ADDITEM(kat_suction,15);
             MACRO_ADDITEM(kat_accuvac,1);
+            MACRO_ADDITEM(kat_suction,10);
         };
     };
 };

addons/airway/XEH_PREP.hpp

@@ -1,6 +1,6 @@
 PREP(checkAirway);
-PREP(checkRecovery);
 PREP(checkMask);
+PREP(checkRecovery);
 PREP(fullHealLocal);
 PREP(gui_updateBodyImage);
 PREP(gui_updateInjuryListGeneral);

addons/airway/XEH_postInit.sqf

@@ -2,9 +2,7 @@
 
 if !(GVAR(enable)) exitWith {};
 
-[QGVAR(larynxLocal), LINKFUNC(treatmentAdvanced_larynxLocal)] call CBA_fnc_addEventHandler;
 [QGVAR(airwayLocal), LINKFUNC(treatmentAdvanced_airwayLocal)] call CBA_fnc_addEventHandler;
-[QGVAR(guedelLocal), LINKFUNC(treatmentAdvanced_guedelLocal)] call CBA_fnc_addEventHandler;
 [QGVAR(accuvacLocal), LINKFUNC(treatmentAdvanced_accuvacLocal)] call CBA_fnc_addEventHandler;
 [QGVAR(recoveryPositionLocal), LINKFUNC(treatmentAdvanced_RecoveryPositionLocal)] call CBA_fnc_addEventHandler;
 [QGVAR(cancelRecoveryPositionLocal), LINKFUNC(treatmentAdvanced_CancelRecoveryPositionLocal)] call CBA_fnc_addEventHandler;