Merge pull request #379 from y0014984/dev

Release v0.5.3 RC1

AUTHORS.txt

@@ -9,7 +9,11 @@
 y0014984
 Wasserstoff
 
-# CONTRIBUTORS
-Bilibagga (Russian translation)
+# CODE CONTRIBUTORS
+JulesVerner
+
+# TRANSLATION CONTRIBUTORS
+Bilibagga (Russian Translation)
 PowerBOXx (Simplified Chinese Translation)
-alexisdu7589 (French translation)
+alexisdu7589 (French Translation)
+Seraf (Italian Translation)

README.md

@@ -4,15 +4,15 @@
 
 <p align="center">
     <a href="https://github.com/y0014984/Advanced-Equipment/releases/latest">
-        <img src="https://img.shields.io/badge/Version-0.5.2-blue.svg?style=flat-square" alt="Advanced Equipment Version">
+        <img src="https://img.shields.io/badge/Version-0.5.3-blue.svg?style=flat-square" alt="Advanced Equipment Version">
     </a>
     <a href="https://www.bistudio.com/community/licenses/arma-public-license-share-alike">
         <img src="https://img.shields.io/badge/License-APL%20SA-red.svg?style=flat-square" alt="Advanced Equipment License">
     </a>
 </p>
 
 <p align="center">
-    <sup><strong>Requires the latest version of <a href="https://github.com/CBATeam/CBA_A3/releases">CBA A3</a> and <a href="https://github.com/acemod/ACE3/releases">ACE3</a> for server and client.<br/></strong></sup>
+    <sup><strong>Requires the latest version of <a href="https://github.com/CBATeam/CBA_A3/releases">CBA_A3</a> and <a href="https://github.com/acemod/ACE3/releases">ACE3</a> for server and client.<br/></strong></sup>
 </p>
 
 **Advanced Equipment** is a mod for Arma 3, that is still under development. I wanted to create a mod, that allows you to really use a lot of the vanilla equipment like laptops and lamps.
@@ -21,35 +21,37 @@ This project is entirely **open-source** and all contributions are welcome. Feel
 
 ## Features
 
-- Power Management (Power Consumption, Batteries, Sun Collectors, Generators)
+- Power Management (Power Consumption, Batteries, Sun Collectors, Generators, Connections)
 - Interaction (Turn On/Off/Standby/Adjust/Use things like Laptops and Lamps, Put in Inventory)
-- armaOS (Unique Terminal-like interface for computers; multiple designs)
-- Filesystem Managment (Files, Folders and Programs on Computers and USB-Sticks)
+- armaOS (Unique Terminal-like interface for computers; multiple designs, User Management)
+- Filesystem Managment (Files, Folders and Programs on Computers and USB-Sticks, incl. Permissions)
 - Network Management (only basics implemented yet)
 - Logistics (Fold and unfold objects, move them around, put them into vehicles)
-- 3DEN Modules (Easy Mission Making)
-- Localization (English, German, French, Russian, Simplified Chinese)
+- 3DEN Modules (Easy Mission Making by adding Connections, Files, Directories, Users, Commands and Games)
+- Zeus Support (Modules, Connections, Settings, Functions)
+- "UI on texture" for armaOS computers (every player sees the live screen)
+- Localization (English, German, French, Italian, Russian, Simplified Chinese)
 
 ## Wiki
-See <a href="https://github.com/y0014984/Advanced-Equipment/wiki">Wiki pages</a> for additional information on how to use Advanced Equipment. 
+
+See <a href="https://github.com/y0014984/Advanced-Equipment/wiki">Wiki pages</a> for additional information on how to use Advanced Equipment.
 
 ## Installation
 
-Download the latest versions of Advanced Equipment, CBA_A3 and ACE. Unpack these mods in your Arma 3 and Arma 3 server installation folders.
+Download the latest versions of Advanced Equipment, CBA_A3 and ACE3. Unpack these mods in your Arma 3 and Arma 3 server installation folders.
 Simply launch Arma 3 with `-mod=@CBA_A3;@ace;@AE3`. You can also get this mod on <a href="https://steamcommunity.com/sharedfiles/filedetails/?id=2888888564">Steam Workshop</a>.
 
 ## Known Issues
 
-* This mod is still under development and isn't recommended for productive use right now.
-* No Zeus support at the moment.
+- This mod is still under development and isn't recommended for productive use right now.
 
 ## Contact and Contribution
 
-If you want to contribute or have any questions, simply join my [Discord](https://discord.com/invite/JMmxXEx) We are always searching for contributors that help us on translations.
+If you want to contribute or have any questions, simply join my [Discord](https://discord.com/invite/JMmxXEx) We are always searching for contributors that help us with modelling, coding and translations.
 
 ## AE3 Developer Report
 
-See our <a href="https://www.youtube.com/watch?v=pfM_eAQinmY&list=PLbrLObIILp9NzNUi-QtDtAwV5UEnYMfO_">AE3-DEVREP</a> Developer Video Blog for letest changes, bugfixes and new features.
+See our <a href="https://www.youtube.com/watch?v=pfM_eAQinmY&list=PLbrLObIILp9NzNUi-QtDtAwV5UEnYMfO_">AE3-DEVREP</a> Developer Video Blog for latest changes, bugfixes and new features.
 
 ## License
 

addons/armaos/CfgVehicles.hpp

@@ -6,6 +6,12 @@ class CfgVehicles
 	class Land_Laptop_03_black_F;
 	class Land_Laptop_03_black_F_AE3: Land_Laptop_03_black_F
 	{
+		scopeCurator = 2; // Zeus visability; 2 will show it in the menu, 0 will hide it.
+
+		editorCategory = "AE3_Assets";
+
+		curatorInfoTypeEmpty = "AE3_UserInterface_Zeus_Asset_Details";
+
 		// Eden Editor Attributes
 		class Attributes
 		{
@@ -29,12 +35,6 @@ class CfgVehicles
 			};
 		};
 
-		// Event Handlers
-		class EventHandlers
-		{
-			//init = "params ['_entity']; call compile preprocessFileLineNumbers '\z\ae3\addons\main\init\initLaptop.sqf';";
-		};
-
 		class AE3_Equipment
 		{
 			displayName = "$STR_AE3_ArmaOS_Config_LaptopDisplayName";
@@ -48,20 +48,20 @@ class CfgVehicles
 			closeAction = "_this call AE3_interaction_fnc_laptop_close;";
 			closeActionCondition = "isNull (_this getVariable ['AE3_computer_mutex', objNull])";
 
-      class AE3_ace3Interactions
+			class AE3_ace3Interactions
 			{
-				class AE3_aceCarrying
-				{
-					// Carrying
-					ae3_dragging_canCarry = 1;  // Can be dragged (0-no, 1-yes)
-					ae3_dragging_carryPosition[] = {0, 1, 1};  // Offset of the model from the body while dragging (same as attachTo)
-					ae3_dragging_carryDirection = 0;  // Model direction while dragging (same as setDir after attachTo)
-				};
-				class AE3_aceCargo
-				{
-					ae3_cargo_canLoad = 1;  // Enables the object to be loaded (1-yes, 0-no)
-					ae3_cargo_size = 1;  // Cargo space the object takes
-				};
+					class AE3_aceCarrying
+					{
+						// Carrying
+						ae3_dragging_canCarry = 1;  // Can be dragged (0-no, 1-yes)
+						ae3_dragging_carryPosition[] = {0, 1, 1};  // Offset of the model from the body while dragging (same as attachTo)
+						ae3_dragging_carryDirection = 0;  // Model direction while dragging (same as setDir after attachTo)
+					};
+					class AE3_aceCargo
+					{
+						ae3_cargo_canLoad = 1;  // Enables the object to be loaded (1-yes, 0-no)
+						ae3_cargo_size = 1;  // Cargo space the object takes
+					};
 			};
 		};
 
@@ -134,7 +134,13 @@ class CfgVehicles
 	class Land_Laptop_03_olive_F;
 	class Land_Laptop_03_olive_F_AE3: Land_Laptop_03_olive_F
 	{
-  	// Eden Editor Attributes
+		scopeCurator = 2; // Zeus visability; 2 will show it in the menu, 0 will hide it.
+
+		editorCategory = "AE3_Assets";
+
+		curatorInfoTypeEmpty = "AE3_UserInterface_Zeus_Asset_Details";
+
+  		// Eden Editor Attributes
 		class Attributes
 		{
 			class AE3_EdenAttribute_PowerLevel
@@ -157,12 +163,6 @@ class CfgVehicles
 			};
 		};
 
-		// Event Handlers
-		class EventHandlers
-		{
-			//init = "params ['_entity']; call compile preprocessFileLineNumbers '\z\ae3\addons\main\init\initLaptop.sqf';";
-		};
-
 		class AE3_Equipment
 		{
 			displayName = "$STR_AE3_ArmaOS_Config_LaptopDisplayName";
@@ -176,7 +176,7 @@ class CfgVehicles
 			closeAction = "_this call AE3_interaction_fnc_laptop_close;";
 			closeActionCondition = "isNull (_this getVariable ['AE3_computer_mutex', objNull])";
 
-      class AE3_ace3Interactions
+      		class AE3_ace3Interactions
 			{
 				class AE3_aceCarrying
 				{
@@ -262,7 +262,13 @@ class CfgVehicles
 	class Land_Laptop_03_sand_F;
 	class Land_Laptop_03_sand_F_AE3: Land_Laptop_03_sand_F
 	{
-  	// Eden Editor Attributes
+		scopeCurator = 2; // Zeus visability; 2 will show it in the menu, 0 will hide it.
+
+		editorCategory = "AE3_Assets";
+
+		curatorInfoTypeEmpty = "AE3_UserInterface_Zeus_Asset_Details";
+
+		// Eden Editor Attributes
 		class Attributes
 		{
 			class AE3_EdenAttribute_PowerLevel
@@ -285,12 +291,6 @@ class CfgVehicles
 			};
 		};
 
-		// Event Handlers
-		class EventHandlers
-		{
-			//init = "params ['_entity']; call compile preprocessFileLineNumbers '\z\ae3\addons\main\init\initLaptop.sqf';";
-		};
-
 		class AE3_Equipment
 		{
 			displayName = "$STR_AE3_ArmaOS_Config_LaptopDisplayName";
@@ -410,6 +410,7 @@ class CfgVehicles
 	{
 		// Standard object definitions
 		scope = 2; // Editor visibility; 2 will show it in the menu, 1 will hide it.
+		scopeCurator = 2; // Zeus visability; 2 will show it in the menu, 0 will hide it.
 		displayName = "$STR_AE3_ArmaOS_Config_AddUserDisplayName"; // Name displayed in the menu
 		icon = "\z\ae3\addons\armaos\ui\AE3_Module_Icons_addUser.paa"; // Map icon. Delete this entry to use the default icon
 		category = "AE3_armaosModules";
@@ -428,7 +429,7 @@ class CfgVehicles
 		is3DEN = 0;
 
 		// Menu displayed when the module is placed or double-clicked on by Zeus
-		curatorInfoType = "RscDisplayAttributeModuleUserlist";
+		curatorInfoType = "AE3_UserInterface_Zeus_Module_AddUser";
 
 		// Module attributes, uses https://community.bistudio.com/wiki/Eden_Editor:_Configuring_Attributes#Entity_Specific
 		class Attributes: AttributesBase
@@ -484,10 +485,13 @@ class CfgVehicles
 	{
 		// Standard object definitions
 		scope = 2; // Editor visibility; 2 will show it in the menu, 1 will hide it.
+		scopeCurator = 2; // Zeus visability; 2 will show it in the menu, 0 will hide it.
 		displayName = "$STR_AE3_ArmaOS_Config_AddSecurityCommandsDisplayName"; // Name displayed in the menu
 		icon = "\z\ae3\addons\armaos\ui\AE3_Module_Icon_addSecurityCommands_v2.paa"; // Map icon. Delete this entry to use the default icon
 		category = "AE3_armaosModules";
 
+		portrait = "\z\ae3\addons\armaos\ui\AE3_Module_Icon_addSecurityCommands_v2.paa"; // seems to be used by Zeus as icon
+
 		// Name of function triggered once conditions are met
 		function = "AE3_armaos_fnc_module_addSecurityCommands";
 		// Execution priority, modules with lower number are executed first. 0 is used when the attribute is undefined
@@ -502,7 +506,7 @@ class CfgVehicles
 		is3DEN = 0;
 
 		// Menu displayed when the module is placed or double-clicked on by Zeus
-		curatorInfoType = "RscDisplayAttributeModuleAddSecurityCommands";
+		curatorInfoType = "AE3_UserInterface_Zeus_Module_AddSecurityCommands";
 
 		// Module attributes, uses https://community.bistudio.com/wiki/Eden_Editor:_Configuring_Attributes#Entity_Specific
 		class Attributes: AttributesBase
@@ -563,6 +567,7 @@ class CfgVehicles
 	{
 		// Standard object definitions
 		scope = 2; // Editor visibility; 2 will show it in the menu, 1 will hide it.
+		scopeCurator = 2; // Zeus visability; 2 will show it in the menu, 0 will hide it.
 		displayName = "$STR_AE3_ArmaOS_Config_AddGamesDisplayName"; // Name displayed in the menu
 		icon = "\z\ae3\addons\armaos\ui\AE3_Module_Icons_addGames.paa"; // Map icon. Delete this entry to use the default icon
 		category = "AE3_armaosModules";
@@ -581,11 +586,24 @@ class CfgVehicles
 		is3DEN = 0;
 
 		// Menu displayed when the module is placed or double-clicked on by Zeus
-		curatorInfoType = "RscDisplayAttributeModuleAddGames";
+		curatorInfoType = "AE3_UserInterface_Zeus_Module_AddGames";
 
 		// Module attributes, uses https://community.bistudio.com/wiki/Eden_Editor:_Configuring_Attributes#Entity_Specific
 		class Attributes: AttributesBase
 		{
+
+			// Arguments shared by specific module type (have to be mentioned in order to be present)
+			class AE3_ModuleAddGames_IsSnake: Checkbox
+			{
+				property = "AE3_Module_AddGames_Snake";
+				displayName = "snake";
+				tooltip = "$STR_AE3_ArmaOS_Config_ModuleAddGamesSnakeTooltip";
+				typeName = "BOOL"; // Value type, can be "NUMBER", "STRING" or "BOOL"
+				// Default text filled in the input box
+				// Because it is an expression, to return a String one must have a string within a string
+				defaultValue = true;
+			};
+
 			class ModuleDescription: ModuleDescription{}; // Module description should be shown last
 		};
 

addons/armaos/XEH_PREP.hpp

@@ -43,6 +43,10 @@ PREP(computer_standby);
 PREP(computer_turnOn);
 PREP(computer_turnOff);
 
+PREP(computer_addUser);
+PREP(computer_addSecurityCommands);
+PREP(computer_addGames);
+
 PREP(computer_getLocality);
 
 /* OS Link Functions */
@@ -80,6 +84,7 @@ PREP(os_lsusb);
 
 /* Encryption Functions */
 PREP(encryption_caesar);
+PREP(encryption_columnar);
 
 /* Terminal Functions */
 PREP(terminal_init);
@@ -102,9 +107,10 @@ PREP(terminal_setPrompt);
 PREP(terminal_updateOutput);
 PREP(terminal_getAllowedKeysDE);
 PREP(terminal_getAllowedKeysFR);
+PREP(terminal_getAllowedKeysIT);
 PREP(terminal_getAllowedKeysUS);
 PREP(terminal_getHeaderText);
-PREP(terminal_updateBufferVisable);
+PREP(terminal_updateBufferVisible);
 PREP(terminal_updatePromptPointer);
 PREP(terminal_addToHistory);
 PREP(terminal_setKeyboardLayout);
@@ -113,4 +119,12 @@ PREP(terminal_switchKeyboardLayout);
 PREP(terminal_switchTerminalDesign);
 PREP(terminal_setCommandLineByHistory);
 PREP(terminal_setInputMode);
-PREP(terminal_updateBatteryStatus);
+PREP(terminal_updateBatteryStatus);
+
+PREP(terminal_uiOnTex_init);
+PREP(terminal_uiOnTex_updateAll);
+PREP(terminal_uiOnTex_updateOutput);
+PREP(terminal_uiOnTex_updateBatteryStatus);
+PREP(terminal_uiOnTex_setTerminalDesign);
+PREP(terminal_uiOnTex_setKeyboardLayout);
+PREP(terminal_uiOnTex_addUpdateAllEventHandler);

addons/armaos/XEH_preInit.sqf

@@ -9,8 +9,8 @@
 	["STR_AE3_Main_CbaSettings_KeyboardLayoutName", "STR_AE3_Main_CbaSettings_KeyboardLayoutTooltip"],
 	"STR_AE3_ArmaOS_CbaSettings_ArmaOSCategoryName",
 	[
-		["US", "FR", "DE"],
-		[["US", "United States"], ["FR", "France"], ["DE", "Deutschland"]], 
+		["US", "FR", "IT", "DE"],
+		[["US", "United States"], ["FR", "France"], ["IT", "Italia"], ["DE", "Deutschland"]], 
 		0
 	],
     nil, // "_isGlobal" flag. Set this to true to always have this setting synchronized between all clients in multiplayer
@@ -65,4 +65,19 @@
     false // Setting will be marked as needing mission restart after being changed. (optional, default false) <BOOL>
 ] call CBA_fnc_addSetting;
 
+/* ================================================================================ */
+
+[
+	"AE3_UiOnTexture",
+	"CHECKBOX",
+	["STR_AE3_Main_CbaSettings_UiOnTextureName", "STR_AE3_Main_CbaSettings_UiOnTextureTooltip"],
+	"STR_AE3_ArmaOS_CbaSettings_ArmaOSCategoryName",
+	false,
+    nil, // "_isGlobal" flag. Set this to true to always have this setting synchronized between all clients in multiplayer
+    {  
+        params ["_value"];
+    }, // function that will be executed once on mission start and every time the setting is changed.
+    false // Setting will be marked as needing mission restart after being changed. (optional, default false) <BOOL>
+] call CBA_fnc_addSetting;
+
 /* ================================================================================ */