Merge branch 'unstable' into AegisAtlas

official-antistasi-community · Jun 12, 2022 · 2f3dc26 · 2f3dc26
2 parents 4037662 + ef42225
commit 2f3dc26
Show file tree

Hide file tree

Showing 56 changed files with 13,825 additions and 8,461 deletions.
diff --git a/.github/workflows/publishBranchToSteamDev.yml b/.github/workflows/publishBranchToSteamDev.yml
@@ -0,0 +1,46 @@
+on:
+  workflow_dispatch:
+
+jobs:
+
+  build:
+    runs-on: windows-latest
+    timeout-minutes: 5
+    steps:
+    - name: Checkout the code
+      uses: actions/checkout@v2
+
+    - name: Increment version locally
+      run: chmod +x ./tools/incrementVersion.js &&
+        node ./tools/incrementVersion.js -b ${{github.sha}}
+
+    - name: Build addons
+      run: '.\tools\Builder\buildAddons.ps1 -metaFileName meta_dev.cpp'
+
+    - name: Upload build addon artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: A3A
+        path: build\A3A
+
+  upload:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    needs: [build]
+    steps:
+    - name: Download addon artifact
+      uses: actions/download-artifact@v2
+      with:
+        name: A3A
+        path: A3A
+
+    - name: Publish to Steam Workshop
+      uses: arma-actions/workshop-upload@v1
+      with:
+        appId: '107410'      # default
+        itemId: '2729074499' # https://steamcommunity.com/sharedfiles/filedetails/?id=2729074499
+        contentPath: 'A3A'
+        changelog: '[url=https://github.com/official-antistasi-community/A3-Antistasi/commit/${{github.sha}}]Update from branch: ${{github.REF_NAME}}[/url].'
+      env:
+        STEAM_USERNAME: ${{ secrets.STEAM_USERNAME }}
+        STEAM_PASSWORD: ${{ secrets.STEAM_PASSWORD }}
diff --git a/.github/workflows/workshopUpdate_Dev.yml b/.github/workflows/workshopUpdate_Dev.yml
@@ -1,5 +1,4 @@
 on:
-  workflow_dispatch:
   push:
     branches:
     - unstable
@@ -11,14 +10,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      
-      - name: Merge unstable -> steam-staging
+
+      - name: Merge unstable -> steam-staging-2
         uses: devmasx/merge-branch@master
         with:
           type: now
-          target_branch: steam-staging
+          target_branch: steam-staging-2
           github_token: ${{ github.token }}
-    
+
   version:
     runs-on: windows-latest
     timeout-minutes: 2
@@ -27,7 +26,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
         with:
-          ref: steam-staging
+          ref: steam-staging-2
 
       - run: chmod +x ./tools/incrementVersion.js
       - run: node ./tools/incrementVersion.js -b ${{github.sha}}
@@ -43,7 +42,7 @@ jobs:
     - name: Checkout the code
       uses: actions/checkout@v2
       with:
-        ref: 'steam-staging'
+        ref: 'steam-staging-2'
 
     - name: Build addons
       run: '.\tools\Builder\buildAddons.ps1 -metaFileName meta_dev.cpp'

diff --git a/A3A/addons/Garage/Public/config.inc b/A3A/addons/Garage/Public/config.inc
@@ -51,7 +51,9 @@ if (isNil "HR_GRG_ServiceDisabled_Refuel") then {HR_GRG_ServiceDisabled_Refuel =
 if (isNil "HR_GRG_ServiceDisabled_Repair") then {HR_GRG_ServiceDisabled_Repair = false};
 
 //camo blacklist (display name, case sensitive)
-HR_GRG_blackListCamo = ["IDAP", "African Desert Extremists", "African Desert Extremists 01", "African Desert Extremists 02", "African Desert Extremists Alt"];
+HR_GRG_blackListCamo = ["IDAP", "African Desert Extremists", "African Desert Extremists 01", "African Desert Extremists 02",
+"African Desert Extremists Alt", "Middle East Extremists", "Middle East Extremists Alt", "Middle East Extremists 1", "Middle East Extremists 2",
+"Middle East Extremists 3", "Middle East Extremists 4", "Middle East Extremists 5", "Middle East Extremists 6"];
 //proxies
 HR_GRG_fnc_Hint = {
     params ["_key", ["_arguments", []]];

diff --git a/A3A/addons/core/Templates/Templates/3CB/3CBFactions_Logistics_Nodes.sqf b/A3A/addons/core/Templates/Templates/3CB/3CBFactions_Logistics_Nodes.sqf
@@ -167,6 +167,38 @@ A3A_logistics_vehicleHardpoints append [
     ["UK3CB_ADC_C_Pickup" call A3A_fnc_classNameToModel,[
         [1,             [0,-0.95,-0.84],          [4,5,6]],
         [1,             [0,-1.75,-0.84],          [7]]
+    ]],
+    //3CB M270_Carrier
+    ["UK3CB_KRG_B_M270_Carrier" call A3A_fnc_classNameToModel,[
+        [1,             [0,-0.4,1.12],          []],
+        [1,             [0,-1.2,1.12],          []],
+        [1,             [0,-2,1.12],            []],
+        [1,             [0,-2.8,1.12],          []]
+    ]],
+    //3CB T810 Open/closed, same Model
+    ["UK3CB_LDF_B_T810_Open" call A3A_fnc_classNameToModel,[
+        [1,             [0,0.7,-1],           [0,1]],
+        [1,             [0,-0.1,-1],          [2,3]],
+        [1,             [0,-0.9,-1],          [4,5]],
+        [1,             [0,-1.7,-1],          [6,7]],
+        [1,             [0,-2.5,-1],          [8,9]]
+    ]],
+    //3CB T810 Armed Open/closed, same Model
+    ["UK3CB_LDF_B_T810_Open_PKM" call A3A_fnc_classNameToModel,[
+        [1,             [0,0.7,-1.31],           [0,1]],
+        [1,             [0,-0.1,-1.31],          [2,3]],
+        [1,             [0,-0.9,-1.31],          [4,5]],
+        [1,             [0,-1.7,-1.31],          [6,7]],
+        [1,             [0,-2.5,-1.31],          [8,9]]
+    ]],
+    //3CB T810 Recovery
+    ["UK3CB_LDF_B_T810_Recovery" call A3A_fnc_classNameToModel,[
+        [1,             [0,0.7,-1],           []],
+        [1,             [0,-0.1,-1],          []],
+        [1,             [0,-0.9,-1],          []],
+        [1,             [0,-1.7,-1],          []],
+        [1,             [0,-2.5,-1],          []],
+        [1,             [0,-3.3,-1],          []]
     ]]
 ];
 
@@ -182,6 +214,8 @@ A3A_logistics_coveredVehicles append [
     "UK3CB_B_M939_Closed_HIDF" call A3A_fnc_classNameToModel
     , "UK3CB_B_MTVR_Closed_WDL" call A3A_fnc_classNameToModel
     , "UK3CB_C_V3S_Closed" call A3A_fnc_classNameToModel
+    , "UK3CB_LDF_B_T810_Closed_PKM" call A3A_fnc_classNameToModel
+    , "UK3CB_LDF_B_T810_Closed" call A3A_fnc_classNameToModel
 ];
 
 //if you want a weapon to be loadable you need to add it to this as a array of [model, [blacklist specific vehicles]],

diff --git a/A3A/addons/core/Templates/Templates/3CB/3CB_AI_AAF.sqf b/A3A/addons/core/Templates/Templates/3CB/3CB_AI_AAF.sqf
@@ -28,11 +28,8 @@
 ["vehiclesFuelTrucks", ["UK3CB_AAF_B_MTVR_Refuel", "UK3CB_AAF_B_M939_Fuel"]] call _fnc_saveToTemplate;
 ["vehiclesMedical", ["UK3CB_AAF_B_M113_AMB"]] call _fnc_saveToTemplate;
 ["vehiclesAPCs", ["UK3CB_AAF_B_LAV25", "UK3CB_AAF_B_LAV25", "UK3CB_AAF_B_AAV", "UK3CB_AAF_B_LAV25_HQ", "UK3CB_AAF_B_M113_M2", "UK3CB_AAF_B_AAV"]] call _fnc_saveToTemplate;
-["vehiclesTanks", ["UK3CB_AAF_B_M60A3", "UK3CB_AAF_I_T72BC"]] call _fnc_saveToTemplate;
+["vehiclesTanks", ["UK3CB_AAF_B_M60A3", "UK3CB_AAF_I_T72BC", "UK3CB_AAF_B_FV4201", "UK3CB_AAF_B_M1A1"]] call _fnc_saveToTemplate;
 ["vehiclesAA", ["UK3CB_AAF_O_ZsuTank", "UK3CB_AAF_O_MTLB_ZU23"]] call _fnc_saveToTemplate; //UK3CB_AAF_O_2S6M_Tunguska
-["vehiclesLightAPCs", []] call _fnc_saveToTemplate;
-["vehiclesIFVs", []] call _fnc_saveToTemplate;
-
 
 ["vehiclesTransportBoats", ["UK3CB_AAF_B_RHIB"]] call _fnc_saveToTemplate;
 ["vehiclesGunBoats", ["UK3CB_AAF_B_RHIB_Gunboat"]] call _fnc_saveToTemplate;
@@ -42,13 +39,15 @@
 ["vehiclesPlanesAA", ["UK3CB_AAF_O_MIG29S"]] call _fnc_saveToTemplate;
 ["vehiclesPlanesTransport", ["UK3CB_AAF_B_C130J"]] call _fnc_saveToTemplate;
 
-["vehiclesHelisLight", ["UK3CB_AAF_B_UH1H", "UK3CB_AAF_B_Benches_MH9"]] call _fnc_saveToTemplate;
+["vehiclesHelisLight", ["UK3CB_AAF_B_UH1H", "UK3CB_AAF_B_Benches_MH9", "UK3CB_AAF_B_Bell412_Utility"]] call _fnc_saveToTemplate;
 ["vehiclesHelisTransport", ["UK3CB_AAF_B_UH60M2", "UK3CB_AAF_B_UH60M", "UK3CB_AAF_O_Mi8AMT", "UK3CB_AAF_O_Mi8", "UK3CB_AAF_I_UH1H_M240"]] call _fnc_saveToTemplate;
-["vehiclesHelisAttack", ["UK3CB_AAF_B_AH1Z_GS", "UK3CB_AAF_B_AH1Z", "UK3CB_AAF_B_UH1H_GUNSHIP", "UK3CB_AAF_I_Mi_24V", "UK3CB_AAF_I_Mi8AMTSh"]] call _fnc_saveToTemplate;
+["vehiclesHelisAttack", ["UK3CB_AAF_B_AH1Z_GS", "UK3CB_AAF_B_AH1Z", "UK3CB_AAF_B_UH1H_GUNSHIP", "UK3CB_AAF_I_Mi_24V", "UK3CB_AAF_I_Mi8AMTSh", "UK3CB_AAF_B_Bell412_Armed", "UK3CB_AAF_B_Bell412_Armed_AT"]] call _fnc_saveToTemplate;
 
-["vehiclesArtillery", ["UK3CB_AAF_B_M109"]] call _fnc_saveToTemplate;
+["vehiclesArtillery", ["UK3CB_AAF_B_M109", "UK3CB_AAF_B_M270_MLRS_HE", "UK3CB_AAF_B_M270_MLRS_CLUSTER"]] call _fnc_saveToTemplate;
 ["magazines", createHashMapFromArray [
-["UK3CB_AAF_B_M109", ["rhs_mag_155mm_m795_28"]]
+["UK3CB_AAF_B_M109", ["rhs_mag_155mm_m795_28"]],
+["UK3CB_AAF_B_M270_MLRS_HE", ["UK3CB_M31_MLRS_X12"]],
+["UK3CB_AAF_B_M270_MLRS_CLUSTER", ["UK3CB_M26_MLRS_X12"]]
 ]] call _fnc_saveToTemplate;
 
 ["uavsAttack", ["B_UAV_02_dynamicLoadout_F"]] call _fnc_saveToTemplate;
@@ -262,8 +261,8 @@ _sfLoadoutData set ["machineGuns", [
 ]];
 _sfLoadoutData set ["marksmanRifles", [
 ["UK3CB_PSG1A1_RIS", "uk3cb_muzzle_snds_g3", "", "rhsusf_acc_LEUPOLDMK4", ["UK3CB_G3_20rnd_762x51"], [], "rhsusf_acc_harris_bipod"],
-["UK3CB_PSG1A1_RIS", "uk3cb_muzzle_snds_g3", "", "rhsusf_acc_m8541", ["UK3CB_G3_20rnd_762x51"], [], "rhsusf_acc_harris_bipod"],
-["UK3CB_PSG1A1_RIS", "uk3cb_muzzle_snds_g3", "", "rhsusf_acc_leupoldmk4_2", ["UK3CB_G3_20rnd_762x51"], [], "rhsusf_acc_harris_bipod"],
+["UK3CB_PSG1A1_RIS", "uk3cb_muzzle_snds_g3", "", "rhsusf_acc_M8541", ["UK3CB_G3_20rnd_762x51"], [], "rhsusf_acc_harris_bipod"],
+["UK3CB_PSG1A1_RIS", "uk3cb_muzzle_snds_g3", "", "rhsusf_acc_LEUPOLDMK4_2", ["UK3CB_G3_20rnd_762x51"], [], "rhsusf_acc_harris_bipod"],
 ["rhs_weap_m14ebrri", "rhsusf_acc_aac_762sdn6_silencer", "rhsusf_acc_anpeq15side_bk", "rhsusf_acc_M8541", ["rhsusf_20Rnd_762x51_m993_Mag"], [], "rhsusf_acc_harris_bipod"],
 ["rhs_weap_m14ebrri", "rhsusf_acc_aac_762sdn6_silencer", "rhsusf_acc_anpeq15side_bk", "rhsusf_acc_LEUPOLDMK4", ["rhsusf_20Rnd_762x51_m993_Mag"], [], "rhsusf_acc_harris_bipod"],
 ["rhs_weap_m14ebrri", "rhsusf_acc_aac_762sdn6_silencer", "rhsusf_acc_anpeq15side_bk", "rhsusf_acc_premier_mrds", ["rhsusf_20Rnd_762x51_m993_Mag"], [], "rhsusf_acc_harris_bipod"],
@@ -276,7 +275,7 @@ _sfLoadoutData set ["marksmanRifles", [
 ]];
 _sfLoadoutData set ["sniperRifles", [
 ["rhs_weap_XM2010_d", "rhsusf_acc_M2010S_d", "rhsusf_acc_anpeq15side_bk", "rhsusf_acc_M8541_d", [], [], "rhsusf_acc_harris_bipod"],
-["rhs_weap_XM2010_d", "rhsusf_acc_M2010S_d", "rhsusf_acc_anpeq15side_bk", "rhsusf_acc_leupoldmk4_2_d", [], [], "rhsusf_acc_harris_bipod"],
+["rhs_weap_XM2010_d", "rhsusf_acc_M2010S_d", "rhsusf_acc_anpeq15side_bk", "rhsusf_acc_LEUPOLDMK4_2_d", [], [], "rhsusf_acc_harris_bipod"],
 ["rhs_weap_m24sws", "rhsusf_acc_m24_silencer_black", "", "rhsusf_acc_M8541", ["rhsusf_5Rnd_762x51_m993_Mag"], [], "rhsusf_acc_harris_swivel"],
 ["rhs_weap_m24sws", "rhsusf_acc_m24_silencer_black", "", "rhsusf_acc_premier", ["rhsusf_5Rnd_762x51_m993_Mag"], [], "rhsusf_acc_harris_swivel"],
 ["rhs_weap_m24sws", "rhsusf_acc_m24_silencer_black", "", "rhsusf_acc_LEUPOLDMK4", ["rhsusf_5Rnd_762x51_m993_Mag"], [], "rhsusf_acc_harris_swivel"],

diff --git a/A3A/addons/core/Templates/Templates/3CB/3CB_AI_ADA.sqf b/A3A/addons/core/Templates/Templates/3CB/3CB_AI_ADA.sqf
@@ -33,10 +33,6 @@
 ["vehiclesTanks", ["UK3CB_ADA_I_T72A", "UK3CB_ADA_I_T72B", "UK3CB_ADA_I_T72BM", "UK3CB_ADA_I_T55"]] call _fnc_saveToTemplate;
 ["vehiclesAA", ["UK3CB_ADA_I_ZsuTank", "UK3CB_ADA_I_Ural_Zu23"]] call _fnc_saveToTemplate;
 
-["vehiclesLightAPCs", []] call _fnc_saveToTemplate;			//this line determines light APCs
-["vehiclesIFVs", []] call _fnc_saveToTemplate;				//this line determines IFVs
-
-
 ["vehiclesTransportBoats", ["UK3CB_TKA_B_RHIB"]] call _fnc_saveToTemplate;
 ["vehiclesGunBoats", ["UK3CB_TKA_B_RHIB_Gunboat"]] call _fnc_saveToTemplate;
 ["vehiclesAmphibious", ["UK3CB_ADA_I_BTR80a", "UK3CB_ADA_I_BMP2", "UK3CB_ADA_I_BTR70"]] call _fnc_saveToTemplate;
@@ -261,8 +257,8 @@ _sfLoadoutData set ["marksmanRifles", [
 ["rhs_weap_m14ebrri", "rhsusf_acc_aac_762sdn6_silencer", "rhsusf_acc_anpeq15side_bk", "rhsusf_acc_LEUPOLDMK4", ["rhsusf_20Rnd_762x51_m993_Mag"], [], "rhsusf_acc_harris_bipod"],
 ["rhs_weap_m14ebrri", "rhsusf_acc_aac_762sdn6_silencer", "rhsusf_acc_anpeq15side_bk", "rhsusf_acc_premier_mrds", ["rhsusf_20Rnd_762x51_m993_Mag"], [], "rhsusf_acc_harris_bipod"],
 ["UK3CB_PSG1A1_RIS", "uk3cb_muzzle_snds_g3", "", "rhsusf_acc_LEUPOLDMK4", ["UK3CB_G3_20rnd_762x51"], [], "rhsusf_acc_harris_bipod"],
-["UK3CB_PSG1A1_RIS", "uk3cb_muzzle_snds_g3", "", "rhsusf_acc_m8541", ["UK3CB_G3_20rnd_762x51"], [], "rhsusf_acc_harris_bipod"],
-["UK3CB_PSG1A1_RIS", "uk3cb_muzzle_snds_g3", "", "rhsusf_acc_leupoldmk4_2", ["UK3CB_G3_20rnd_762x51"], [], "rhsusf_acc_harris_bipod"]
+["UK3CB_PSG1A1_RIS", "uk3cb_muzzle_snds_g3", "", "rhsusf_acc_M8541", ["UK3CB_G3_20rnd_762x51"], [], "rhsusf_acc_harris_bipod"],
+["UK3CB_PSG1A1_RIS", "uk3cb_muzzle_snds_g3", "", "rhsusf_acc_LEUPOLDMK4_2", ["UK3CB_G3_20rnd_762x51"], [], "rhsusf_acc_harris_bipod"]
 ]];
 _sfLoadoutData set ["sniperRifles", [
 ["rhs_weap_m40a5", "", "rhsusf_acc_anpeq15side_bk", "rhsusf_acc_M8541", ["rhsusf_5Rnd_762x51_m993_Mag"], [], "rhsusf_acc_harris_swivel"],
@@ -353,8 +349,8 @@ _militaryLoadoutData set ["marksmanRifles", [
 ]];
 _militaryLoadoutData set ["sniperRifles", [
 ["UK3CB_PSG1A1_RIS", "", "", "rhsusf_acc_LEUPOLDMK4", ["UK3CB_G3_20rnd_762x51"], [], "rhsusf_acc_harris_bipod"],
-["UK3CB_PSG1A1_RIS", "", "", "rhsusf_acc_m8541", ["UK3CB_G3_20rnd_762x51"], [], "rhsusf_acc_harris_bipod"],
-["UK3CB_PSG1A1_RIS", "", "", "rhsusf_acc_leupoldmk4_2", ["UK3CB_G3_20rnd_762x51"], [], "rhsusf_acc_harris_bipod"],
+["UK3CB_PSG1A1_RIS", "", "", "rhsusf_acc_M8541", ["UK3CB_G3_20rnd_762x51"], [], "rhsusf_acc_harris_bipod"],
+["UK3CB_PSG1A1_RIS", "", "", "rhsusf_acc_LEUPOLDMK4_2", ["UK3CB_G3_20rnd_762x51"], [], "rhsusf_acc_harris_bipod"],
 ["rhs_weap_t5000", "", "", "rhs_acc_dh520x56", [], [], "rhs_acc_harris_swivel"]
 ]];
 
@@ -372,7 +368,7 @@ _policeLoadoutData set ["shotGuns", [
 ]];
 _policeLoadoutData set ["SMGs", [
 ["UK3CB_MP5A2", "", "uk3cb_acc_surefiregrip", "", [], [], ""],
-["UK3CB_HK33KA2_RIS", "", "rhsusf_acc_m952v", "", [], [], ""],
+["UK3CB_HK33KA2_RIS", "", "rhsusf_acc_M952V", "", [], [], ""],
 ["rhs_weap_ak74n", "", "rhs_acc_2dpzenit", "", ["rhs_30Rnd_545x39_7N10_AK"], [], ""]
 ]];
 _policeLoadoutData set ["sidearms", [