Merge branch 'main' into music-rework

OverlordZorn · Nov 10, 2024 · d7675aa · d7675aa
2 parents 17c6634 + c8441e5
commit d7675aa
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 9 deletions.
diff --git a/.github/workflows/merge-version-bump.yml → ...ub/Draft-workflows/merge-version-bump.yml b/.github/workflows/merge-version-bump.yml → ...ub/Draft-workflows/merge-version-bump.yml
diff --git 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

diff --git a/.hemtt/missions/CSC.Altis/init.sqf b/.hemtt/missions/CSC.Altis/init.sqf
@@ -40,6 +40,28 @@ params [
     ],                                                                       // Array of Backpacks to be filled into - Default: []
     createHashMapFromArray [
         ["airdrop_pos_start",   [10000,10000,1000]],
+        ["box_empty",           true],
+        ["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;
+[
+    "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"],

diff --git a/.hemtt/missions/CSC.Altis/mission.sqm b/.hemtt/missions/CSC.Altis/mission.sqm
diff --git 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.

diff --git 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];

diff --git 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;

diff --git 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. 

diff --git 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 121
+#define PATCH 1
+#define BUILD 122
 
 
 // #define VERSION MACROS