Merge remote-tracking branch 'refs/remotes/origin/(0.0.6d)'

@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_changeSkills.sqf

@@ -15,10 +15,10 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 #define SKILLS			["aimingAccuracy","aimingShake","aimingSpeed","endurance","spotDistance","spotTime","courage","reloadSpeed","commanding"]
-#define ACE_TRAITS		["ace_medical_medicClass","ACE_IsEngineer","ACE_isEOD"]
+#define N_TRAITS		3
 #define VANILLA_TRAITS	["medic","engineer","explosiveSpecialist"]
 
-private ["_dialogResult","_mode","_number_of_traits","_trait_values","_choices"];
+private ["_dialogResult","_mode","_number_of_traits","_trait_values","_choices","_skill_value","_medic_class"];
 
 _entity = param [0, ObjNull, [grpNull, ObjNull]];
 _is_single_unit = (typeName _entity == "OBJECT");
@@ -36,45 +36,60 @@ _skill_choices =
 	[localize "STR_RELOAD_SPEED","SLIDER"],
 	[localize "STR_COMMANIDNG","SLIDER"]
 ];
-
 _curatorSelected = [];
 if (_is_single_unit) then 
 {
+	{
+		_skill_value = _entity skill (SKILLS select _forEachIndex);
+		_skill_value = linearConversion [0.2,1,_skill_value,0,1,true];
+		_x append [_skill_value, true];
+	} forEach _skill_choices;
+
 	_mode = if (_entity isKindOf "Man") then {"man"} else {"vehicle"};
 	_curatorSelected = [_mode] call Achilles_fnc_getCuratorSelected;
 	_choices = if (_ace_loaded) then
 	{
-		_number_of_traits = count ACE_TRAITS;
+		_number_of_traits = N_TRAITS;
+		_medic_class = _entity getVariable ["ace_medical_medicClass", -1];
+		if (_medic_class == -1) then 
+		{
+			_medic_class = if (_entity getUnitTrait "medic") then {1} else {0};
+		};
 		[
-			[localize "STR_MEDICINE",[localize "STR_FALSE", localize "STR_CLS", localize "STR_DOCTOR"]],
-			[localize "STR_ENGINEER",[localize "STR_FALSE", localize "STR_TRUE"]],
-			[localize "STR_EXPLOSIVE_SPECIALIST",[localize "STR_FALSE", localize "STR_TRUE"]]
+			[localize "STR_MEDICINE",[localize "STR_FALSE", localize "STR_CLS", localize "STR_DOCTOR"], _medic_class, true],
+			[localize "STR_ENGINEER",[localize "STR_FALSE", localize "STR_TRUE"], parseNumber ([_entity] call ace_common_fnc_isEngineer), true],
+			[localize "STR_EOD",[localize "STR_FALSE", localize "STR_TRUE"], parseNumber ([_entity] call ace_common_fnc_isEOD), true]
 		]
 	} else
 	{
-		_number_of_traits = count VANILLA_TRAITS;
+		_number_of_traits = N_TRAITS;
 		[
-			[localize "STR_MEDICINE",[localize "STR_FALSE", localize "STR_TRUE"]],
-			[localize "STR_ENGINEER",[localize "STR_FALSE", localize "STR_TRUE"]],
-			[localize "STR_EOD",[localize "STR_FALSE", localize "STR_TRUE"]]
+			[localize "STR_MEDICINE",[localize "STR_FALSE", localize "STR_TRUE"], parseNumber (_entity getUnitTrait "medic"), true],
+			[localize "STR_ENGINEER",[localize "STR_FALSE", localize "STR_TRUE"], parseNumber (_entity getUnitTrait "engineer"), true],
+			[localize "STR_EOD",[localize "STR_FALSE", localize "STR_TRUE"], parseNumber (_entity getUnitTrait "explosiveSpecialist"), true]
 		]
 	};
 	_choices append _skill_choices;
 } else 
 {
+	_entity = leader _entity;
+	{
+		_skill_value = _entity skill (SKILLS select _forEachIndex);
+		_skill_value = linearConversion [0.2,1,_skill_value,0,1,true];
+		_x append [_skill_value, true];
+	} forEach _skill_choices;
+
 	_mode = "group";
 	_curatorSelectedGrps = [_mode] call Achilles_fnc_getCuratorSelected;
 	{_curatorSelected append units _x} forEach _curatorSelectedGrps;
 	_number_of_traits = 0;
-	_units = units _entity;
 	_choices = _skill_choices;
 };
 
 _dialogResult =
 [
 	localize "STR_SKILL",
-	_choices,
-	"Achilles_fnc_RscDisplayAtttributes_ChangeSkills"
+	_choices
 ] call Ares_fnc_ShowChooseDialog;
 
 if (count _dialogResult == 0) exitWith {};
@@ -101,11 +116,11 @@ if (_is_single_unit) then
 		};
 		{
 			_unit = _x;
-			{
-				_trait_type = _x;
-				_trait_value = _trait_values select _forEachIndex;
-				_unit setVariable [_trait_type,_trait_value,true];
-			} forEach ACE_TRAITS;
+			_unit setVariable ["ace_medical_medicClass",_trait_values select 0,true];
+			_trait_value = if(_trait_values select 1 == 0) then {false} else {true};
+			_unit setVariable ["ACE_isEngineer",_trait_value,true];
+			_trait_value = if(_trait_values select 2 == 0) then {false} else {true};
+			_unit setVariable ["ACE_isEOD",_trait_value,true];
 
 			if (local _unit) then
 			{

@AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_damageComponents.sqf

@@ -42,8 +42,9 @@ _curatorSelected = ["vehicle"] call Achilles_fnc_getCuratorSelected;
 if (local _vehicle) then
 {
 	{
+		_vehicle = _x;
 		{
-			_x setHitIndex [_forEachIndex,_x];
+			_vehicle setHitIndex [_forEachIndex,_x];
 		} forEach _dialogResult;
 	} forEach _curatorSelected;
 } else

@AresModAchillesExpansion/addons/modules_f_ares/Behaviours/functions/fn_BehaviourSurrenderUnits.sqf

@@ -47,7 +47,7 @@ private _nextCaptureStateDialogResult = nil;
 					]
 				] call Ares_fnc_ShowChooseDialog;
 				// terminate script
-				if (count _nextCaptureStateDialogResult == 0) exitWith {deleteVehicle _logic};
+				if (count _nextCaptureStateDialogResult == 0) exitWith {deleteVehicle _logic; breakOut MAIN_SCOPE_NAME};
 			};
 			[_unitToSurrender,objNull,_nextCaptureStateDialogResult] remoteExec ["Ares_fnc_surrenderUnit",_unitToSurrender];
 		} else

@AresModAchillesExpansion/addons/modules_f_ares/FireSupport/functions/fn_FireSupportArtilleryFireMission.sqf

@@ -7,42 +7,6 @@
 
 #include "\achilles\modules_f_ares\module_header.hpp"
 
-// initalize artillery fire function
-if (isNil "Ares_FireArtilleryFunction") then
-{
-	Ares_FireArtilleryFunction = {
-		_artilleryUnit = _this select 0;
-		_targetPos = _this select 1;
-		_ammoType = _this select 2;
-		_roundsToFire = _this select 3;
-		enableEngineArtillery true;
-		if (_artilleryUnit isKindOf "StaticWeapon") then
-		{
-			_artilleryUnit addEventHandler 
-			[
-				"Fired",
-				"_artilleryUnit = _this select 0;
-				_artilleryUnit commandArtilleryFire [" + str _targetPos + "," + str _ammoType + ", 1];
-				_count = _artilleryUnit getVariable [""Ares_arty_cout"", 1];
-				_count = _count + 1;
-				if (_count >= " + str _roundsToFire + ") then
-				{
-					_artilleryUnit removeAllEventHandlers ""Fired"";
-					_artilleryUnit setVariable [""Ares_arty_cout"", nil];
-				} else
-				{
-					_artilleryUnit setVariable [""Ares_arty_cout"", _count];
-				}"
-			];
-			_artilleryUnit commandArtilleryFire [_targetPos, _ammoType, 1];
-		} else
-		{
-			_artilleryUnit commandArtilleryFire [_targetPos, _ammoType, _roundsToFire];
-		};
-	};
-	publicVariable "Ares_FireArtilleryFunction";
-};
-
 private ["_objects","_guns","_rounds","_ammo","_targetPos"];
 
 _objects = nearestObjects [(_this select 0), ["All"], 150];
@@ -231,7 +195,7 @@ if (_roundEta == -1) exitWith { [localize "STR_NO_TARGET_IN_RANGE"] call Ares_fn
 
 // Fire the guns
 {
-	[[_x, _targetPos, _ammo, _rounds], "Ares_FireArtilleryFunction", _x] call BIS_fnc_MP;
+	[_x, [_targetPos, _ammo, _rounds]] remoteExec ["commandArtilleryFire", _x];
 } forEach _gunsToFire;
 [localize "STR_FIRE_ROUNDS_AND_ETA", _rounds, _ammo, _roundEta] call Ares_fnc_ShowZeusMessage;
 

@AresModAchillesExpansion/addons/modules_f_ares/Zeus/functions/fn_ZeusAddRemoveEditableObjects.sqf

@@ -43,14 +43,14 @@ if (_range_mode == 0) then
 		case 0: {nearestObjects [_center_pos,[],_radius]};
 		case 1: 
 		{
-			_units = nearestObjects [_center_pos,["LandVehicle","Tank","Air","Ship"],_radius];
+			_units = nearestObjects [_center_pos,["Man","LandVehicle","Air","Ship"],_radius];
 			if (_dialogResult select 4 == 1) then
 			{
 				_side = [(_dialogResult select 5) - 1] call BIS_fnc_sideType;
-				_units select {(side _x) isEqualTo _side};
+				_units select {(side _x) isEqualTo _side and count crew _x > 0};
 			} else
 			{
-				_units;
+				_units select {count crew _x > 0};
 			};
 		};
 		case 2: {nearestObjects [_center_pos,["LandVehicle","Air","Ship"],_radius]};

@AresModAchillesExpansion/addons/ui_f/cfgFunctions.hpp

@@ -56,7 +56,6 @@ class CfgFunctions
 			class RscDisplayAtttributes_SpawnIntel;
 			class RscDisplayAtttributes_DamageComponents;
 			class RscDisplayAttributes_Chatter;
-			class RscDisplayAtttributes_ChangeSkills;
 			class RscDisplayAttributes_SpawnEmptyObject;
 			class RscDisplayAttributes_selectAIUnits;
 			class RscDisplayAttributes_editableObjects;

@AresModAchillesExpansion/mod.cpp

@@ -1,14 +1,14 @@
-name = "Ares Mod - Achilles Expansion (0.0.6c)";
+name = "Ares Mod - Achilles Expansion (0.0.6d)";
 picture = "\achilles\data_f_achilles\pictures\Achilles_Icon_005.paa";
 author = "Ares by Anton Struyk, AE by Kex";
-description = "Ares Mod - Achilles Expansion (0.0.6c)";
+description = "Ares Mod - Achilles Expansion (0.0.6d)";
 logo = "\achilles\data_f_achilles\pictures\Achilles_Icon_005.paa";
 logoSmall = "\achilles\data_f_achilles\icons\icon_achilles_small.paa";
 logoOver = "\achilles\data_f_achilles\pictures\Achilles_Icon_005.paa";
-tooltip = "Ares Mod - Achilles Expansion (0.0.6c)";
+tooltip = "Ares Mod - Achilles Expansion (0.0.6d)";
 tooltipOwned = "Ares Mod - Achilles Expansion Owned";
 actionName = "Website";
 action = "https://forums.bistudio.com/topic/191113-ares-mod-achilles-expansion/?p=3031548";
 overview = "Ares augments the existing Zeus functionality, expanding the toolset and making it easy to create more compelling missions on the fly.<br />The Achilles Expansion (AE) includes Ares Mod with even more functionalites. Some functionalities only work with ACE mod, but those mods are not mandatory in order to run Ares (AE) properly.";
 overviewPicture = "\achilles\data_f_achilles\pictures\Achilles_Icon_005.paa";
-overviewText = "Ares Mod - Achilles Expansion (0.0.6c)";
+overviewText = "Ares Mod - Achilles Expansion (0.0.6d)";

@AresModAchillesExpansion/readme.md

@@ -10,6 +10,14 @@ As of V.1.8.0 Ares requires @CBA_A3 for some functionality. Please ensure it is
 You can download the latest version of CBA from the developer website here: http://dev.withsix.com/projects/cca/wiki/CBA
 
 Changelists
+V.0.0.6d (Achilles Expansion (alpha version))
+* Change:	Artillery fire support module: Removed workaround (BIS fixed it).
+* Fix:		Add/Remove objects to Zeus: Type "Unit" did not select soldiers. Moreover, it did select empty vehicles.
+* Fix:		Ares Compositions did not work properly in 1.68.
+* Fix:		Damage Vehicle Components: Did not work for local units.
+* Fix:		Cange Skills/Traits: EOD label was missing in ACE version.
+* Fix:		Cange Skills/Traits: EOD and engineer did not work for ACE.
+
 V.0.0.6c (Achilles Expansion (alpha version))
 * Fix:		Spawn attributes ticks were not updated after reopening zeus interface.
 * Fix:		Target/LZ/RP logics default value was always the same & wrong message.