Merge branch 'master' into tweakItemRadio

.github/workflows/release.yml

@@ -128,15 +128,15 @@ jobs:
         echo "::endgroup::"
         ls *.zip
     - name: Upload to FTP (ACRE2)
-      uses: appleboy/scp-action@master
+      uses: appleboy/scp-action@v0.1.3
       with:
         host: ${{ secrets.FTP_SERVER }}
         username: ${{ secrets.FTP_USERNAME }}
         password: ${{ secrets.FTP_PASSWORD }}
         source: "acre2_${{ needs.build.outputs.VERSION }}${{ github.event.inputs.label }}.zip"
         target: "${{ secrets.FTP_SERVER }}/test/${{ github.event.inputs.path }}"
     - name: Upload to FTP (Symbols)
-      uses: appleboy/scp-action@master
+      uses: appleboy/scp-action@v0.1.3
       with:
         host: ${{ secrets.FTP_SERVER }}
         username: ${{ secrets.FTP_USERNAME }}
@@ -176,15 +176,15 @@ jobs:
         echo "::endgroup::"
         ls *.zip
     - name: Upload to FTP (ACRE2)
-      uses: appleboy/scp-action@master
+      uses: appleboy/scp-action@v0.1.3
       with:
         host: ${{ secrets.FTP_SERVER }}
         username: ${{ secrets.FTP_USERNAME }}
         password: ${{ secrets.FTP_PASSWORD }}
         source: "acre2_${{ needs.build.outputs.VERSION }}.zip"
         target: "${{ secrets.FTP_SERVER }}/dev"
     - name: Upload to FTP (Symbols)
-      uses: appleboy/scp-action@master
+      uses: appleboy/scp-action@v0.1.3
       with:
         host: ${{ secrets.FTP_SERVER }}
         username: ${{ secrets.FTP_USERNAME }}
@@ -234,15 +234,15 @@ jobs:
         echo "::endgroup::"
         ls *.zip
     - name: Upload to FTP (ACRE2)
-      uses: appleboy/scp-action@master
+      uses: appleboy/scp-action@v0.1.3
       with:
         host: ${{ secrets.FTP_SERVER }}
         username: ${{ secrets.FTP_USERNAME }}
         password: ${{ secrets.FTP_PASSWORD }}
         source: "acre2_${{ needs.build.outputs.VERSION }}.zip"
         target: "${{ secrets.FTP_SERVER }}/release"
     - name: Upload to FTP (Symbols)
-      uses: appleboy/scp-action@master
+      uses: appleboy/scp-action@v0.1.3
       with:
         host: ${{ secrets.FTP_SERVER }}
         username: ${{ secrets.FTP_USERNAME }}
@@ -259,70 +259,21 @@ jobs:
       env:
         STEAM_USERNAME: ${{ secrets.STEAM_USERNAME }}
         STEAM_PASSWORD: ${{ secrets.STEAM_PASSWORD }}
-    - name: Upload to Steam (ACRE2 Global Mobilization Compatibility)
-      uses: arma-actions/workshop-upload@v1
-      with:
-        appId: '107410'
-        itemId: '1740990569'  # Global Mobilization Compatibility
-        contentPath: '@acre2/optionals/@acre2_sys_gm'
-        changelog: 'Version ${{ needs.build.outputs.VERSION }} - See changelog on GitHub: https://github.com/IDI-Systems/acre2/releases'
-      env:
-        STEAM_USERNAME: ${{ secrets.STEAM_USERNAME }}
-        STEAM_PASSWORD: ${{ secrets.STEAM_PASSWORD }}
-    - name: Upload to Steam (ACRE2 S.O.G. Prairie Fire Compatibility)
-      uses: arma-actions/workshop-upload@v1
-      with:
-        appId: '107410'
-        itemId: '2450980898'  # S.O.G. Prairie Fire Compatibility
-        contentPath: '@acre2/optionals/@acre2_sys_sog'
-        changelog: 'Version ${{ needs.build.outputs.VERSION }} - See changelog on GitHub: https://github.com/IDI-Systems/acre2/releases'
-      env:
-        STEAM_USERNAME: ${{ secrets.STEAM_USERNAME }}
-        STEAM_PASSWORD: ${{ secrets.STEAM_PASSWORD }}
-    - name: Upload to Steam (ACRE2 CSLA Iron Curtain Compatibility)
-      uses: arma-actions/workshop-upload@v1
-      with:
-        appId: '107410'
-        itemId: '2649217268'  # CSLA Iron Curtain Compatibility
-        contentPath: '@acre2/optionals/@acre2_sys_csla'
-        changelog: 'Version ${{ needs.build.outputs.VERSION }} - See changelog on GitHub: https://github.com/IDI-Systems/acre2/releases'
-      env:
-        STEAM_USERNAME: ${{ secrets.STEAM_USERNAME }}
-        STEAM_PASSWORD: ${{ secrets.STEAM_PASSWORD }}
-    - name: Upload to Steam (ACRE2 Western Sahara Compatibility)
-      uses: arma-actions/workshop-upload@v1
-      with:
-        appId: '107410'
-        itemId: '2657862776'  # Western Sahara Compatibility
-        contentPath: '@acre2/optionals/@acre2_sys_ws'
-        changelog: 'Version ${{ needs.build.outputs.VERSION }} - See changelog on GitHub: https://github.com/IDI-Systems/acre2/releases'
-      env:
-        STEAM_USERNAME: ${{ secrets.STEAM_USERNAME }}
-        STEAM_PASSWORD: ${{ secrets.STEAM_PASSWORD }}
-    - name: Prepare GitHub
-      id: release_drafter
-      uses: release-drafter/release-drafter@v5
-      with:
-        name: ACRE2 v${{ needs.build.outputs.VERSION }}
-        tag: v${{ needs.build.outputs.VERSION }}
-        version: ${{ needs.build.outputs.VERSION }}
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - name: Upload to GitHub
-      uses: actions/upload-release-asset@v1
+      id: github_release
+      uses: actions/action-gh-release@v1
       with:
-        upload_url: ${{ steps.release_drafter.outputs.upload_url }}
-        asset_path: ./acre2_${{ needs.build.outputs.VERSION }}.zip
-        asset_name: acre2_${{ needs.build.outputs.VERSION }}.zip
-        asset_content_type: application/zip
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        draft: true
+        files: acre2_${{ needs.build.outputs.VERSION }}.zip
+        name: 'ACRE2 v${{ needs.build.outputs.VERSION }}'
+        tag_name: v${{ needs.build.outputs.VERSION }}
+        target_commitish: ${{ github.sha }}
     - name: Slack Notification
       uses: rtCamp/action-slack-notify@v2
       env:
         SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
         SLACK_USERNAME: Publisher
         SLACK_ICON_EMOJI: ":package:"
-        SLACK_MESSAGE: 'Release uploaded and published! Go to ${{ steps.release_drafter.outputs.html_url }} to finalize release notes and publish on GitHub.'
+        SLACK_MESSAGE: 'Release uploaded and published! Go to ${{ steps.github_release.outputs.url }} to finalize release notes and publish on GitHub.'
         SLACK_TITLE: Release Status
         MSG_MINIMAL: actions url

.gitignore

@@ -6,6 +6,7 @@ hemtt.exe
 symbols/*
 keys/*
 .hemtt/local
+hemtt.toml
 idi/*
 a3/*
 *.cache

.hemtt/hooks/post_release/01_rename_zip.rhai

@@ -5,5 +5,5 @@ let dst = releases.join(HEMTT.project().name().to_lower() + "_" + HEMTT.project(
 
 print("Moving zip to " + dst);
 if !src.move(dst) {
-    fatal("Failed to move " + src + " to " + dst);
+    warn("Failed to move " + src + " to " + dst + " (maybe --no-archive?)");
 }

.hemtt/project.toml

@@ -1,4 +1,5 @@
 name = "ACRE2"
+mainprefix = "idi"
 prefix = "acre"
 author = "ACRE2 Team"
 
@@ -37,3 +38,8 @@ workshop = [
     "450814997", # CBA_A3's Workshop ID
     "463939057", # ACE3's Workshop ID
 ]
+
+[hemtt.launch.cba]
+workshop = [
+    "450814997", # CBA_A3's Workshop ID
+]

README.md

@@ -4,7 +4,7 @@
 
 <p align="center">
     <a href="https://github.com/IDI-Systems/acre2/releases/latest">
-        <img src="https://img.shields.io/badge/Version-2.10.0-blue.svg?style=flat-square" alt="ACRE2 Version">
+        <img src="https://img.shields.io/badge/Version-2.11.0-blue.svg?style=flat-square" alt="ACRE2 Version">
     </a>
     <a href="https://github.com/IDI-Systems/acre2/issues">
         <img src="https://img.shields.io/github/issues-raw/IDI-Systems/acre2.svg?style=flat-square&label=Issues" alt="ACRE2 Issues">

addons/compat_csla/$PBOPREFIX$

@@ -0,0 +1 @@
+idi\acre\addons\compat_csla

optionals/sys_csla/README.md → addons/compat_csla/README.md

@@ -1,4 +1,4 @@
-sys_csla
+compat_csla
 ===
 
 Compatibility with Arma 3 Creator DLC: [CSLA Iron Curtain](https://store.steampowered.com/app/1294440/Arma_3_Creator_DLC_CSLA_Iron_Curtain/).

optionals/sys_csla/config.cpp → addons/compat_csla/config.cpp

@@ -6,7 +6,8 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"acre_main"};
+        requiredAddons[] = {"acre_main", "CSLA"};
+        skipWhenMissingDependencies = 1;
         author = ECSTRING(main,Author);
         authors[] = {"CSLA Studio"};
         url = ECSTRING(main,URL);
@@ -16,6 +17,6 @@ class CfgPatches {
 
 class CfgAcreWorlds {
     class stozec {
-        wrp = "\idi\acre\addons\sys_csla\stozec.fakewrp";
+        wrp = QPATHTOF(stozec.fakewrp);
     };
 };

optionals/sys_csla/script_component.hpp → addons/compat_csla/script_component.hpp

@@ -1,13 +1,13 @@
-#define COMPONENT sys_csla
+#define COMPONENT compat_csla
 #define COMPONENT_BEAUTIFIED CSLA Iron Curtain Compatibility
 #include "\idi\acre\addons\main\script_mod.hpp"
 
-#ifdef DEBUG_ENABLED_SYS_CSLA
+#ifdef DEBUG_ENABLED_COMPAT_CSLA
     #define DEBUG_MODE_FULL
 #endif
 
-#ifdef DEBUG_ENABLED_SYS_CSLA
-    #define DEBUG_SETTINGS DEBUG_SETTINGS_SYS_CSLA
+#ifdef DEBUG_ENABLED_COMPAT_CSLA
+    #define DEBUG_SETTINGS DEBUG_SETTINGS_COMPAT_CSLA
 #endif
 
 #include "\idi\acre\addons\main\script_macros.hpp"

addons/compat_gm/$PBOPREFIX$

@@ -0,0 +1 @@
+idi\acre\addons\compat_gm