3.4.1 Changes (#151)

* personalArsenal now uses getPlayerInfo * Fixed minor error * Matt's changes * Release prep
Theseus-Aegis · Nov 24, 2020 · b7034d8 · b7034d8
1 parent 27a7396
commit b7034d8
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 69 deletions.
diff --git a/Olympus.Stratis/functions/fn_initArsenalCrate.sqf b/Olympus.Stratis/functions/fn_initArsenalCrate.sqf
@@ -65,7 +65,7 @@ private _engineer = [
     "ACE_EarPlugs",
     "tacs_Backpack_Carryall_DarkBlack",
     "H_HelmetSpecB",
-    "V_EOD_blue_F",
+    "tacs_Vest_PlateCarrier_Green",
     "ACE_DefusalKit",
     "ACE_M26_Clacker",
     "ACE_Clacker",

diff --git a/Olympus.Stratis/functions/fn_personalArsenal.sqf b/Olympus.Stratis/functions/fn_personalArsenal.sqf
@@ -24,50 +24,17 @@ private _action = [
     {
         params ["_target", "_player"];
 
-        private _accessibleItems = [];
+        private _accessibleItems = ["getAccessibleItemClasses", _player] call TACFUNC(apollo,getPlayerInfo);
 
-        TRACE_1("Loading Client",_player);
-        private _success = false;
+        // Match config case
+        _accessibleItems = _accessibleItems apply {configName (_x call CBA_fnc_getItemConfig)};
 
-        private _loadData = "tac_apollo_client" callExtension format ["%1%2", "getAccessibleItemClasses", getPlayerUID _player];
-        TRACE_1("Load Data Start",_loadData);
+        // Add items to arsenal
+        [_target, _accessibleItems] call ACEFUNC(arsenal,addVirtualItems);
 
-        if (_loadData == "loaded") then {
-            private _updateInfo = true;
-            while {_updateInfo} do {
-                private _loadData = "tac_apollo_client" callExtension "get";
-                TRACE_1("Load Data",_loadData);
+        [_target, _player, false] call ACEFUNC(arsenal,openBox);
 
-                if (_loadData == "error") then {
-                    // Bad things happened, stop executing
-                    _updateInfo = false;
-                } else {
-                    if (_loadData == "done") then {
-                        // Initialization complete
-                        _updateInfo = false;
-                        _success = true;
-                    } else {
-                        // Add items to array
-                        _accessibleItems pushBack _loadData;
-                    };
-                };
-            };
-        };
-
-        if (_success) then {
-            // Match config case
-            _accessibleItems = _accessibleItems apply {configName (_x call CBA_fnc_getItemConfig)};
-
-            // Add items to arsenal
-            [_target, _accessibleItems] call ACEFUNC(arsenal,addVirtualItems);
-
-            [_target, _player, false] call ACEFUNC(arsenal,openBox);
-
-            INFO_1("Personal Arsenal loaded successfuly.");
-        } else {
-            ERROR_2("Failed to load available items for personalArsenal (Name: %1 - UID: %2)!",profileName,getPlayerUID _player);
-            ["Could not load available items for Personal Arsenal"] call CBA_fnc_notify;
-        };
+        INFO("Personal Arsenal loaded successfuly.");
     },
     {true}
 ] call ACEFUNC(interact_menu,createAction);

diff --git a/Olympus.Stratis/mission.sqm b/Olympus.Stratis/mission.sqm
@@ -16,14 +16,14 @@ class EditorData
 	};
 	class LayerIndexProvider
 	{
-		nextID=8717;
+		nextID=8822;
 	};
 	class Camera
 	{
-		pos[]={6564.7417,73.129608,5424.7544};
-		dir[]={-0.91824436,-0.39327136,-0.047028195};
-		up[]={-0.39277846,0.91941643,-0.020116463};
-		aside[]={-0.051151577,5.8456499e-007,0.99871373};
+		pos[]={1938.6355,19.285294,3530.9868};
+		dir[]={0.86777818,-0.4181076,-0.26863369};
+		up[]={0.39941239,0.90839452,-0.12364484};
+		aside[]={-0.2957207,7.5262506e-008,-0.95528036};
 	};
 };
 binarizationWanted=0;
@@ -1945,7 +1945,7 @@ class Mission
 					name="Objects";
 					class Entities
 					{
-						items=24;
+						items=23;
 						class Item0
 						{
 							dataType="Object";
@@ -2371,22 +2371,6 @@ class Mission
 							type="TargetP_Inf_F";
 						};
 						class Item19
-						{
-							dataType="Object";
-							class PositionInfo
-							{
-								position[]={3280.5027,230.01712,2950.1895};
-								angles[]={0.0050033992,3.8989825,0};
-							};
-							side="Empty";
-							flags=4;
-							class Attributes
-							{
-							};
-							id=2313;
-							type="TargetP_Inf_F";
-						};
-						class Item20
 						{
 							dataType="Object";
 							class PositionInfo
@@ -2402,7 +2386,7 @@ class Mission
 							id=2324;
 							type="TargetP_Inf2_F";
 						};
-						class Item21
+						class Item20
 						{
 							dataType="Object";
 							class PositionInfo
@@ -2418,7 +2402,7 @@ class Mission
 							id=2326;
 							type="TargetP_Inf2_F";
 						};
-						class Item22
+						class Item21
 						{
 							dataType="Object";
 							class PositionInfo
@@ -2434,7 +2418,7 @@ class Mission
 							type="TargetP_Inf4_F";
 							atlOffset=0.58953857;
 						};
-						class Item23
+						class Item22
 						{
 							dataType="Object";
 							class PositionInfo
@@ -30315,7 +30299,7 @@ class Mission
 				};
 			};
 			id=405;
-			atlOffset=2.191555;
+			atlOffset=2.4770837;
 		};
 		class Item7
 		{

diff --git a/Olympus.Stratis/script_component.hpp b/Olympus.Stratis/script_component.hpp
@@ -4,7 +4,7 @@
 // Version
 #define MAJOR 3
 #define MINOR 4
-#define PATCHLVL 0
+#define PATCHLVL 1
 
 // Map
 #define MAP Stratis

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 </p>
 <p align="center">
     <a href="https://github.com/Theseus-Aegis/Olympus/releases/latest">
-        <img src="https://img.shields.io/badge/Version-3.4.0-blue.svg" alt="Olympus Version">
+        <img src="https://img.shields.io/badge/Version-3.4.1-blue.svg" alt="Olympus Version">
     </a>
     <a href="https://github.com/Theseus-Aegis/Olympus/issues">
         <img src="https://img.shields.io/github/issues-raw/Theseus-Aegis/Olympus.svg?label=Issues" alt="Olympus Issues">