From 4d396f53ba48061651b8079833f95efa19439303 Mon Sep 17 00:00:00 2001 From: OverlordZorn <56258612+OverlordZorn@users.noreply.github.com> Date: Tue, 5 Nov 2024 17:55:41 +0100 Subject: [PATCH 01/11] Update readme.md --- addons/csc/readme.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/csc/readme.md b/addons/csc/readme.md index 99edd44..33580f2 100644 --- a/addons/csc/readme.md +++ b/addons/csc/readme.md @@ -1,3 +1,6 @@ +> [!Caution] +> THIS NEEDS A FULL REWRITE + # Custom Supply Crates System to add an ACE Interaction to an Object/Classname. From a3b6f664e152a1506147fc62dc7e4f0a823cd6da Mon Sep 17 00:00:00 2001 From: OverlordZorn Date: Sun, 10 Nov 2024 17:08:14 +0100 Subject: [PATCH 02/11] empty_box -> box_empty --- addons/csc/functions/internal/fn_createCrate.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/csc/functions/internal/fn_createCrate.sqf b/addons/csc/functions/internal/fn_createCrate.sqf index 9f87ea2..defae33 100644 --- a/addons/csc/functions/internal/fn_createCrate.sqf +++ b/addons/csc/functions/internal/fn_createCrate.sqf @@ -27,7 +27,7 @@ private _box = createVehicle [_entry get "box_class", [0,0,0],[],2,"CAN_COLLIDE" _box setVariable ["ace_cargo_customname", _entry get "name", true]; -if (_entry get "empty_box") then { +if (_entry get "box_empty") then { // Empties the inventory of the Box clearBackpackCargoGlobal _box; clearMagazineCargoGlobal _box; From 093cc03eb67cf84b9dd8e7334544914d713f348c Mon Sep 17 00:00:00 2001 From: OverlordZorn Date: Sun, 10 Nov 2024 17:18:01 +0100 Subject: [PATCH 03/11] Update script_version.hpp --- addons/main/script_version.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp index 5f98cfd..361cdff 100644 --- a/addons/main/script_version.hpp +++ b/addons/main/script_version.hpp @@ -1,7 +1,7 @@ #define MAJOR 1 #define MINOR 3 -#define PATCH 0 -#define BUILD 63 +#define PATCH 1 +#define BUILD 64 // #define VERSION MACROS From 62acb252fb365879c0e786fa126f14d6fd7a2ec2 Mon Sep 17 00:00:00 2001 From: OverlordZorn Date: Sun, 10 Nov 2024 17:18:06 +0100 Subject: [PATCH 04/11] Update init.sqf --- .hemtt/missions/CSC.Altis/init.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.hemtt/missions/CSC.Altis/init.sqf b/.hemtt/missions/CSC.Altis/init.sqf index 04144ad..2e9df45 100644 --- a/.hemtt/missions/CSC.Altis/init.sqf +++ b/.hemtt/missions/CSC.Altis/init.sqf @@ -40,7 +40,7 @@ params [ ], // Array of Backpacks to be filled into - Default: [] createHashMapFromArray [ ["airdrop_pos_start", [10000,10000,1000]], - ["box_empty", false], + ["box_empty", true], ["box_class", "ACE_medicalSupplyCrate_advanced"], ["airframe_class", "B_T_VTOL_01_vehicle_F"], ["normal_mode", "AIRDROP"], From c910e300ff2eea3b9df18faf1cb49095a2454b49 Mon Sep 17 00:00:00 2001 From: OverlordZorn Date: Sun, 10 Nov 2024 17:18:25 +0100 Subject: [PATCH 05/11] moved workflow to draft --- .github/{workflows => Draft-workflows}/merge-version-bump.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{workflows => Draft-workflows}/merge-version-bump.yml (100%) diff --git a/.github/workflows/merge-version-bump.yml b/.github/Draft-workflows/merge-version-bump.yml similarity index 100% rename from .github/workflows/merge-version-bump.yml rename to .github/Draft-workflows/merge-version-bump.yml From ae7956696af0b20f204ae95cc1efeaa99c70f9ed Mon Sep 17 00:00:00 2001 From: OverlordZorn Date: Sun, 10 Nov 2024 18:20:09 +0100 Subject: [PATCH 06/11] Update script_version.hpp --- addons/main/script_version.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp index 5f98cfd..a86a765 100644 --- a/addons/main/script_version.hpp +++ b/addons/main/script_version.hpp @@ -1,7 +1,7 @@ #define MAJOR 1 #define MINOR 3 #define PATCH 0 -#define BUILD 63 +#define BUILD 65 // #define VERSION MACROS From 0777df4171a9470225e6585b0e5aa9b884367765 Mon Sep 17 00:00:00 2001 From: OverlordZorn Date: Sun, 10 Nov 2024 18:20:21 +0100 Subject: [PATCH 07/11] Update fn_link.sqf --- addons/csc/functions/fn_link.sqf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/csc/functions/fn_link.sqf b/addons/csc/functions/fn_link.sqf index fa3c701..9edf06b 100644 --- a/addons/csc/functions/fn_link.sqf +++ b/addons/csc/functions/fn_link.sqf @@ -28,7 +28,9 @@ if (_target isEqualTo "404") exitWith {ZRN_LOG_MSG(No target provided);}; private _cat = [_catName] call FUNC(catalog); if (_cat isEqualTo "404") exitWith {ZRN_LOG_MSG_1(Catalog not found,_catName);}; -private _links = _cat get _entryName getOrDefault ["links", []]; +private _links = _cat get _entryName getOrDefault ["links", [[],[]]]; + +ZRN_LOG_1(_links); // Check if zeus is enabled for this catalog already - if not - create zeus action and attach it to zeus. From 0be31eca9e4cefb3ebfd710511776a9e2af62246 Mon Sep 17 00:00:00 2001 From: OverlordZorn Date: Sun, 10 Nov 2024 18:20:24 +0100 Subject: [PATCH 08/11] Update fn_register.sqf --- addons/csc/functions/fn_register.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/csc/functions/fn_register.sqf b/addons/csc/functions/fn_register.sqf index 530a033..b3d3bef 100644 --- a/addons/csc/functions/fn_register.sqf +++ b/addons/csc/functions/fn_register.sqf @@ -51,7 +51,7 @@ private _entry = _cat getOrDefault [_entryName, "404"]; if (_entry isEqualTo "404") then { _entry = createHashMapFromArray [ ["entryName", _entryName] ]; - _entry merge [(_cat get "Default Entry"), false]; + _entry merge [+ (_cat get "Default Entry"), false]; }; _entry set ["items", _items]; From d607da1af067931c8031d7a4706a135a6c720345 Mon Sep 17 00:00:00 2001 From: OverlordZorn Date: Sun, 10 Nov 2024 18:23:02 +0100 Subject: [PATCH 09/11] Update init.sqf --- .hemtt/missions/CSC.Altis/init.sqf | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.hemtt/missions/CSC.Altis/init.sqf b/.hemtt/missions/CSC.Altis/init.sqf index 04144ad..ee162f1 100644 --- a/.hemtt/missions/CSC.Altis/init.sqf +++ b/.hemtt/missions/CSC.Altis/init.sqf @@ -48,6 +48,28 @@ params [ + ] // Hashmap of additional parameters that can be changed optionally +] call cvo_csc_fnc_register; +[ + "ACE Medical Box 2", // Name + [ + ["ace_banana", 169], + ["ace_suture", 169], + ["ACE_painkillers", 169] + ], // Array of Items to be filled into - Default: [] + [ + // ["somebackpackclassname", 420] + ], // Array of Backpacks to be filled into - Default: [] + createHashMapFromArray [ + ["airdrop_pos_start", [10000,10000,100]], + ["box_empty", false], + ["box_class", "ACE_medicalSupplyCrate_advanced"], + ["airframe_class", "B_T_VTOL_01_vehicle_F"], + ["normal_mode", "AIRDROP"], + ["airdrop_targetMode", "TARGET"] + + + ] // Hashmap of additional parameters that can be changed optionally ] call cvo_csc_fnc_register; From f81b6f35acef9189853a21c273fd63fd244eef32 Mon Sep 17 00:00:00 2001 From: OverlordZorn Date: Sun, 10 Nov 2024 18:23:04 +0100 Subject: [PATCH 10/11] Update mission.sqm --- .hemtt/missions/CSC.Altis/mission.sqm | Bin 3992 -> 3992 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/.hemtt/missions/CSC.Altis/mission.sqm b/.hemtt/missions/CSC.Altis/mission.sqm index c31b8bbad7653adc2c41f4e6a4843d45bffa0ae5..8583552219774f1ca8359209cbf845084122b1db 100644 GIT binary patch delta 91 zcmbOsKSO?l8k67DdnRs-3dhzvF*5Vtab-%$EMj10WMg#S&p6-b#6CuTt3P&3r3FB- u8iSSl7$?lgwr3142(x2KEY3_x1qz?z;IwCCI3Q%qxZWnhesc+v3NHW|UmFkr delta 91 zcmbOsKSO?l8k67buSRZ++LInTF-pI_ Date: Sun, 10 Nov 2024 18:28:31 +0100 Subject: [PATCH 11/11] pause merge.yml --- .github/workflows/merge.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index e116639..9b21d28 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -1,9 +1,9 @@ name: Merge Version Bump -on: - pull_request: - types: - - closed +# on: +# pull_request: +# types: +# - closed permissions: contents: write