Merge branch 'master' of github.com:KoffeinFlummi/ACE3

addons/captives/CfgVehicles.hpp

@@ -178,7 +178,7 @@ class CfgVehicles {
         curatorCost = 0;  //???
         isGlobal = 1; //run global
         isTriggerActivated  = 1; //Wait for triggers
-        // icon = QUOTE(PATHTOF(ui\todo.paa));
+        icon = QUOTE(PATHTOF(UI\Icon_Module_Make_Unit_Surrender_ca.paa));
         functionPriority = 0;
         class Arguments {};
         class ModuleDescription: ModuleDescription {

addons/common/CfgVehicles.hpp

@@ -33,7 +33,7 @@ class CfgVehicles {
     function = QFUNC(moduleCheckPBOs);
     scope = 2;
     isGlobal = 1;
-    icon = QUOTE(PATHTOF(UI\IconCheckPBO_ca.paa));
+    icon = QUOTE(PATHTOF(UI\Icon_Module_CheckPBO_ca.paa));
     class Arguments {
       class Action {
         displayName = "Action";

addons/common/XEH_postInit.sqf

@@ -183,3 +183,4 @@ _vehicle setFuel _fuelLevel;
 ["displayTextPicture", FUNC(displayTextPicture)] call FUNC(addEventhandler);
 
 ["notOnMap", {!visibleMap}] call FUNC(addCanInteractWithCondition);
+["isNotInside", {_this select 0 == _this select 1 || {vehicle (_this select 0) == _this select 0}}] call FUNC(addCanInteractWithCondition);

addons/explosives/CfgModule.hpp

@@ -1,12 +1,12 @@
 class Module_F;
 class ACE_ModuleExplosive: Module_F {
-  author = "ACE Team";
+  author = "$STR_ACE_Common_ACETeam";
   category = "ACE";
   displayName = "Explosive System";
   function = QUOTE(FUNC(module));
   scope = 2;
   isGlobal = 1;
-  icon = PATHTOF(UI\IconExplosives_ca.paa);
+  icon = PATHTOF(UI\Icon_Module_Explosives_ca.paa);
   class Arguments {
     class RequireSpecialist {
       displayName = "Require specialists?";

addons/hearing/CfgVehicles.hpp

@@ -102,7 +102,7 @@ class CfgVehicles {
         function = QFUNC(moduleHearing);
         scope = 2;
         isGlobal = 1;
-        icon = PATHTOF(UI\IconHearing_ca.paa);
+        icon = PATHTOF(UI\Icon_Module_Hearing_ca.paa);
         class Arguments {
             class EnableCombatDeafness {
                 displayName = "Enable combat deafness?";

addons/interaction/CfgVehicles.hpp

@@ -8,7 +8,7 @@ class CfgVehicles {
     function = "ACE_Interaction_fnc_moduleInteraction";
     scope = 2;
     isGlobal = 1;
-    icon = PATHTOF(UI\IconInteraction_ca.paa);
+    icon = PATHTOF(UI\Icon_Module_Interaction_ca.paa);
     class Arguments {
       class EnableTeamManagement {
         displayName = "Enable Team Management";
@@ -397,6 +397,7 @@ class CfgVehicles {
         priority = 4.5;
         icon = "";  // @todo
         hotkey = "E";
+        exceptions[] = {"notOnMap"};
       };
     };
   };

addons/logistics_wirecutter/functions/fnc_interactEH.sqf

@@ -17,6 +17,7 @@
 
 PARAMS_1(_interactionType);
 
+//Ignore self-interaction menu
 if (_interactionType != 0) exitWith {};
 
 //for performance only do stuff it they have a wirecutter item
@@ -32,7 +33,10 @@ if (!("ACE_wirecutter" in (items ace_player))) exitWith {};
         {deleteVehicle _x;} forEach _addedHelpers;
         [_pfID] call CBA_fnc_removePerFrameHandler;
     } else {
-        //If play moved >5 meters from last pos, then rescan
+        // Prevent Rare Error when ending mission with interact key down:
+        if (isNull ace_player) exitWith {};
+    
+        //If player moved >5 meters from last pos, then rescan
         if (((getPosASL ace_player) distance _setPosition) > 5) then {
 
             _fncStatement = {

addons/map/CfgVehicles.hpp

@@ -7,7 +7,7 @@ class CfgVehicles {
         function = QFUNC(moduleMap);
         scope = 2;
         isGlobal = 1;
-        icon = PATHTOF(UI\IconMap_ca.paa);
+        icon = PATHTOF(UI\Icon_Module_Map_ca.paa);
         class Arguments {
             class MapIllumination {
                 displayName = "Map illumination?";
@@ -46,7 +46,7 @@ class CfgVehicles {
         function = QFUNC(blueForceTrackingModule);
         scope = 2;
         isGlobal = 1;
-        icon = PATHTOF(UI\IconBFTracking_ca.paa);
+        icon = PATHTOF(UI\Icon_Module_BFTracking_ca.paa);
         class Arguments {
             class Interval {
                 displayName = "Interval";

addons/medical/CfgVehicles.hpp

@@ -11,13 +11,13 @@ class CfgVehicles {
     class ACE_moduleMedicalSettings: ACE_Module {
         scope = 2;
         displayName = "Medical Settings [ACE]";
-        icon = QUOTE(PATHTOF(ui\moduleIcon.paa));
+        icon = QUOTE(PATHTOF(UI\Icon_Module_Medical_ca.paa));
         category = "ACE_medical";
         function = QUOTE(DFUNC(moduleMedicalSettings));
         functionPriority = 1;
         isGlobal = 1;
         isTriggerActivated = 0;
-        author = "Glowbal";
+        author = "$STR_ACE_Common_ACETeam";
         class Arguments {
             class level {
                 displayName = "Medical Level";
@@ -133,14 +133,14 @@ class CfgVehicles {
     class ACE_moduleTreatmentConfiguration: ACE_Module {
         scope = 2;
         displayName = "Treatment Configuration [ACE]";
-        icon = QUOTE(PATHTOF(ui\moduleIcon.paa));
+        icon = QUOTE(PATHTOF(UI\Icon_Module_Medical_ca.paa));
         category = "ACE_medical";
         function = QUOTE(FUNC(moduleTreatmentConfiguration));
         functionPriority = 10;
         isGlobal = 2;
         isTriggerActivated = 0;
         isDisposable = 0;
-        author = "Glowbal";
+        author = "$STR_ACE_Common_ACETeam";
         class Arguments {
             class medicSetting {
                 displayName = "Medics setting";
@@ -190,14 +190,14 @@ class CfgVehicles {
     class ACE_moduleAssignMedicRoles: Module_F {
         scope = 2;
         displayName = "Set Medic Class [ACE]";
-        icon = QUOTE(PATHTOF(ui\moduleIcon.paa));
+        icon = QUOTE(PATHTOF(UI\Icon_Module_Medical_ca.paa));
         category = "ACE_medical";
         function = QUOTE(FUNC(moduleAssignMedicRoles));
         functionPriority = 10;
         isGlobal = 2;
         isTriggerActivated = 0;
         isDisposable = 0;
-        author = "Glowbal";
+        author = "$STR_ACE_Common_ACETeam";
         class Arguments {
             class EnableList {
                 displayName = "List";
@@ -236,14 +236,14 @@ class CfgVehicles {
     class ACE_moduleAssignMedicVehicle: Module_F {
         scope = 2;
         displayName = "Set Medical Vehicle [ACE]";
-        icon = QUOTE(PATHTOF(ui\moduleIcon.paa));
+        icon = QUOTE(PATHTOF(UI\Icon_Module_Medical_ca.paa));
         category = "ACE_medical";
         function = QUOTE(FUNC(moduleAssignMedicalVehicle));
         functionPriority = 10;
         isGlobal = 2;
         isTriggerActivated = 0;
         isDisposable = 0;
-        author = "Glowbal";
+        author = "$STR_ACE_Common_ACETeam";
         class Arguments {
             class EnableList {
                 displayName = "List";
@@ -266,14 +266,14 @@ class CfgVehicles {
     class ACE_moduleAssignMedicalFacility: Module_F {
         scope = 2;
         displayName = "Set Medical Facility [ACE]";
-        icon = QUOTE(PATHTOF(ui\moduleIcon.paa));
+        icon = QUOTE(PATHTOF(UI\Icon_Module_Medical_ca.paa));
         category = "ACE_medical";
         function = QUOTE(FUNC(moduleAssignMedicalFacility));
         functionPriority = 10;
         isGlobal = 2;
         isTriggerActivated = 0;
         isDisposable = 0;
-        author = "Glowbal";
+        author = "$STR_ACE_Common_ACETeam";
         class Arguments {
             class enabled {
                 displayName = "Is Medical Facility";
@@ -1700,7 +1700,7 @@ class CfgVehicles {
         scope = 2;
         scopeCurator = 2;
         displayName = $STR_ACE_MEDICAL_BANDAGE_BASIC_DISPLAY;
-        author = "Glowbal";
+        author = "$STR_ACE_Common_ACETeam";
         vehicleClass = "Items";
         class TransportItems
         {
@@ -1715,7 +1715,7 @@ class CfgVehicles {
         scope = 2;
         scopeCurator = 2;
         displayName = $STR_ACE_MEDICAL_PACKING_BANDAGE_DISPLAY;
-        author = "Glowbal";
+        author = "$STR_ACE_Common_ACETeam";
         vehicleClass = "Items";
         class TransportItems
         {
@@ -1730,7 +1730,7 @@ class CfgVehicles {
         scope = 2;
         scopeCurator = 2;
         displayName = $STR_ACE_MEDICAL_BANDAGE_ELASTIC_DISPLAY;
-        author = "Glowbal";
+        author = "$STR_ACE_Common_ACETeam";
         vehicleClass = "Items";
         class TransportItems
         {
@@ -1745,7 +1745,7 @@ class CfgVehicles {
         scope = 2;
         scopeCurator = 2;
         displayName = $STR_ACE_MEDICAL_TOURNIQUET_DISPLAY;
-        author = "Glowbal";
+        author = "$STR_ACE_Common_ACETeam";
         vehicleClass = "Items";
         class TransportItems
         {
@@ -1760,7 +1760,7 @@ class CfgVehicles {
         scope = 2;
         scopeCurator = 2;
         displayName = $STR_ACE_MEDICAL_MORPHINE_DISPLAY;
-        author = "Glowbal";
+        author = "$STR_ACE_Common_ACETeam";
         vehicleClass = "Items";
         class TransportItems
         {
@@ -1775,7 +1775,7 @@ class CfgVehicles {
         scope = 2;
         scopeCurator = 2;
         displayName = $STR_ACE_MEDICAL_ATROPINE_DISPLAY;
-        author = "Glowbal";
+        author = "$STR_ACE_Common_ACETeam";
         vehicleClass = "Items";
         class TransportItems
         {
@@ -1790,7 +1790,7 @@ class CfgVehicles {
         scope = 2;
         scopeCurator = 2;
         displayName = $STR_ACE_MEDICAL_EPINEPHRINE_DISPLAY;
-        author = "Glowbal";
+        author = "$STR_ACE_Common_ACETeam";
         vehicleClass = "Items";
         class TransportItems
         {
@@ -1805,7 +1805,7 @@ class CfgVehicles {
         scope = 2;
         scopeCurator = 2;
         displayName = $STR_ACE_MEDICAL_PLASMA_IV;
-        author = "Glowbal";
+        author = "$STR_ACE_Common_ACETeam";
         vehicleClass = "Items";
         class TransportItems
         {
@@ -1821,7 +1821,7 @@ class CfgVehicles {
         scope = 2;
         scopeCurator = 2;
         displayName = $STR_ACE_MEDICAL_BLOOD_IV;
-        author = "Glowbal";
+        author = "$STR_ACE_Common_ACETeam";
         vehicleClass = "Items";
         class TransportItems
         {
@@ -1836,7 +1836,7 @@ class CfgVehicles {
         scope = 2;
         scopeCurator = 2;
         displayName = $STR_ACE_MEDICAL_SALINE_IV;
-        author = "Glowbal";
+        author = "$STR_ACE_Common_ACETeam";
         vehicleClass = "Items";
         class TransportItems
         {
@@ -1851,7 +1851,7 @@ class CfgVehicles {
         scope = 2;
         scopeCurator = 2;
         displayName = $STR_ACE_MEDICAL_QUIKCLOT_DISPLAY;
-        author = "Glowbal";
+        author = "$STR_ACE_Common_ACETeam";
         vehicleClass = "Items";
         class TransportItems
         {
@@ -1866,7 +1866,7 @@ class CfgVehicles {
         scope = 2;
         scopeCurator = 2;
         displayName = $STR_ACE_MEDICAL_AID_KIT_DISPLAY;
-        author = "Glowbal";
+        author = "$STR_ACE_Common_ACETeam";
         vehicleClass = "Items";
         class TransportItems
         {
@@ -1881,7 +1881,7 @@ class CfgVehicles {
         scope = 2;
         scopeCurator = 2;
         displayName = $STR_ACE_MEDICAL_SURGICALKIT_DISPLAY;
-        author = "Glowbal";
+        author = "$STR_ACE_Common_ACETeam";
         vehicleClass = "Items";
         class TransportItems
         {
@@ -1896,7 +1896,7 @@ class CfgVehicles {
         scope = 2;
         scopeCurator = 2;
         displayName = $STR_ACE_MEDICAL_BODYBAG_DISPLAY;
-        author = "Glowbal";
+        author = "$STR_ACE_Common_ACETeam";
         vehicleClass = "Items";
         class TransportItems
         {
@@ -1914,7 +1914,7 @@ class CfgVehicles {
         accuracy = 1000;
         displayName = "[ACE] Medical Supply Crate";
         model = "\A3\weapons_F\AmmoBoxes\AmmoBox_F";
-        author = "Glowbal";
+        author = "$STR_ACE_Common_ACETeam";
         class TransportItems {
             class ACE_fieldDressing {
                 name = "ACE_fieldDressing";

addons/microdagr/CfgVehicles.hpp

@@ -3,23 +3,34 @@ class CfgVehicles {
     class CAManBase: Man {
         class ACE_SelfActions {
             class ACE_Equipment {
-                class GVAR(openMicroDAGR) {
-                    displayName = "$STR_ACE_microdagr_openUnit";
-                    condition = QUOTE(('ACE_microDAGR' in (items _player)));
-                    statement = QUOTE([] call FUNC(openDisplay));
+                class GVAR(show) {
+                    //Opens the mini map
+                    displayName = "$STR_ACE_microdagr_show";
+                    condition = QUOTE(([DISPLAY_MODE_DISPLAY] call FUNC(canShow)) && {GVAR(currentShowMode) != DISPLAY_MODE_DISPLAY});
+                    statement = QUOTE([DISPLAY_MODE_DISPLAY] call FUNC(openDisplay));
+                    showDisabled = 0;
+                    priority = 0.2;
+                    icon = QUOTE(PATHTOF(data\icon_microDAGR.paa));
+                    exceptions[] = {"notOnMap"};
+                };
+                class GVAR(configure) {
+                    //Opens the dialog
+                    displayName = "$STR_ACE_microdagr_configure";
+                    condition = QUOTE(([DISPLAY_MODE_DIALOG] call FUNC(canShow)) && {GVAR(currentShowMode) != DISPLAY_MODE_DIALOG});
+                    statement = QUOTE([DISPLAY_MODE_DIALOG] call FUNC(openDisplay));
                     showDisabled = 0;
                     priority = 0.1;
                     icon = QUOTE(PATHTOF(data\icon_microDAGR.paa));
-                    hotkey = "G";
-                };                
-                class GVAR(closeMicroDAGR) {
+                    exceptions[] = {"notOnMap"};
+                };
+                class GVAR(close) {
                     displayName = "$STR_ACE_microdagr_closeUnit";
                     condition = QUOTE(GVAR(currentShowMode) != DISPLAY_MODE_CLOSED);
                     statement = QUOTE([DISPLAY_MODE_CLOSED] call FUNC(openDisplay));
                     showDisabled = 0;
-                    priority = 0;
+                    priority = 0.3;
                     icon = QUOTE(PATHTOF(data\icon_microDAGR.paa));
-                    // hotkey = "G";
+                    exceptions[] = {"notOnMap"};
                 };
             };
         };

addons/microdagr/XEH_clientInit.sqf

@@ -4,14 +4,14 @@
 if (!hasInterface) exitWith {};
 
 //Add Keybinds:
-["ACE3", QGVAR(openGPS), (localize "STR_ACE_microdagr_openUnit"),
+["ACE3", QGVAR(openGPS), (localize "STR_ACE_microdagr_toggleUnit"),
 {
-    // Conditions: canInteract
-    _exceptions = [];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // canInteractWith (can use on map)
+    if !([ACE_player, objNull, ["notOnMap"]] call EFUNC(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if (!("ACE_microDAGR" in (items ace_player))) exitWith {false};
-    [] call FUNC(openDisplay);
+
+    [] call FUNC(openDisplay); //toggle display mode
     true;
 },
 {false},
@@ -19,14 +19,13 @@ if (!hasInterface) exitWith {};
 
 ["ACE3", QGVAR(closeGPS), (localize "STR_ACE_microdagr_closeUnit"),
 {
-    // Conditions: canInteract
-    _exceptions = [];
-    if !(_exceptions call EGVAR(common,canInteract)) exitWith {false};
+    // canInteractWith (can use on map)
+    if !([ACE_player, objNull, ["notOnMap"]] call EFUNC(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if (!("ACE_microDAGR" in (items ace_player))) exitWith {false};
     if (GVAR(currentShowMode) == DISPLAY_MODE_CLOSED) exitWith {false};
 
-    [DISPLAY_MODE_CLOSED] call FUNC(openDisplay);
+    [DISPLAY_MODE_CLOSED] call FUNC(openDisplay); //close unit
     true;
 },
 {false},

addons/microdagr/functions/fnc_canShow.sqf

@@ -9,7 +9,7 @@
  * Nothing
  *
  * Example:
- * [] call ace_microdagr_fnc_canShow
+ * [mode] call ace_microdagr_fnc_canShow
  *
  * Public: No
  */
@@ -17,13 +17,21 @@
 
 PARAMS_1(_showType);
 
-//Can always do closed or hidden
-if (_showType in [DISPLAY_MODE_CLOSED, DISPLAY_MODE_HIDDEN]) exitWith {true};
+private ["_returnValue"];
 
-//Can't interact then hide gps:   TODO: any exceptions?
-if (!([ACE_player, objNull, []] call EGVAR(common,canInteractWith))) exitWith {false};
+_returnValue = false;
 
- //Can't have minimap up while zoomed in
-if ((_showType == DISPLAY_MODE_DISPLAY) && {cameraview == "GUNNER"}) exitWith {false};
+switch (_showType) do {
+case (DISPLAY_MODE_CLOSED): {_returnValue = true}; //Can always close
+case (DISPLAY_MODE_HIDDEN): {_returnValue = true}; //Can always hide
 
-true
+case (DISPLAY_MODE_DIALOG): {
+        _returnValue = ("ACE_microDAGR" in (items ACE_player)) && {[ACE_player, objNull, ["notOnMap"]] call EFUNC(common,canInteractWith)};
+    };
+case (DISPLAY_MODE_DISPLAY): {
+        //Can't have minimap up while zoomed in
+        _returnValue = (cameraview != "GUNNER") && {"ACE_microDAGR" in (items ACE_player)} && {[ACE_player, objNull, ["notOnMap"]] call EFUNC(common,canInteractWith)};
+    };
+};
+
+_returnValue

addons/microdagr/functions/fnc_openDisplay.sqf

@@ -21,6 +21,7 @@ DEFAULT_PARAM(0,_newDisplayShowMode,-1);
 _oldShowMode = GVAR(currentShowMode);
 
 if (_newDisplayShowMode == -1) then {
+    //Toggle mode button:
     if (_oldShowMode in [DISPLAY_MODE_DISPLAY, DISPLAY_MODE_HIDDEN]) then {_newDisplayShowMode = DISPLAY_MODE_DIALOG};
     if (_oldShowMode in [DISPLAY_MODE_DIALOG, DISPLAY_MODE_CLOSED]) then {_newDisplayShowMode = DISPLAY_MODE_DISPLAY};
 };

addons/microdagr/stringtable.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Edited with tabler - 2015-03-10 -->
+<!-- Edited with tabler - 2015-03-24 -->
 <Project name="ACE">
   <Package name="microdagr">
     <Key ID="STR_ACE_microdagr_itemName">
@@ -42,12 +42,6 @@
       <Russian>Выкл.</Russian>
       <Spanish>No</Spanish>
     </Key>
-    <Key ID="STR_ACE_microdagr_openUnit">
-      <English>Open MicroDAGR</English>
-    </Key>
-    <Key ID="STR_ACE_microdagr_closeUnit">
-      <English>Close MicroDAGR</English>
-    </Key>
     <Key ID="STR_ACE_microdagr_wpEnterCords">
       <English>Enter Grid Cords:</English>
     </Key>
@@ -89,15 +83,27 @@
       <English>Add</English>
     </Key>
     <Key ID="STR_ACE_microdagr_waypointsDelete">
-        <English>Delete</English>
-        <Czech>Smazat</Czech>
-        <French>Supprimer</French>
-        <German>Löschen</German>
-        <Italian>Elimina</Italian>
-        <Polish>Usuń</Polish>
-        <Portuguese>Excluir</Portuguese>
-        <Russian>Удалить</Russian>
-        <Spanish>Suprimir</Spanish>
+      <English>Delete</English>
+      <Czech>Smazat</Czech>
+      <French>Supprimer</French>
+      <German>Löschen</German>
+      <Italian>Elimina</Italian>
+      <Polish>Usuń</Polish>
+      <Portuguese>Excluir</Portuguese>
+      <Russian>Удалить</Russian>
+      <Spanish>Suprimir</Spanish>
+    </Key>
+    <Key ID="STR_ACE_microdagr_toggleUnit">
+      <English>Toggle MicroDAGR Display Mode</English>
+    </Key>
+    <Key ID="STR_ACE_microdagr_show">
+      <English>Show MicoDAGR</English>
+    </Key>
+    <Key ID="STR_ACE_microdagr_configure">
+      <English>Configure MicroDAGR</English>
+    </Key>
+    <Key ID="STR_ACE_microdagr_closeUnit">
+      <English>Close MicroDAGR</English>
     </Key>
   </Package>
 </Project>

addons/missionmodules/CfgVehicles.hpp

@@ -9,13 +9,13 @@ class CfgVehicles {
 	class ACE_moduleAmbianceSound: Module_F {
 		scope = 2;
 		displayName = "Ambiance Sounds [ACE]";
-		icon = QUOTE(PATHTOF(data\moduleSound.paa));
+		icon = QUOTE(PATHTOF(UI\Icon_Module_Ambient_Sounds_ca.paa));
 		category = "ACE_missionModules";
 		function = QUOTE(FUNC(moduleAmbianceSound));
 		functionPriority = 1;
 		isGlobal = 1;
 		isTriggerActivated = 0;
-		author = "Glowbal";
+		author = "$STR_ACE_Common_ACETeam";
 		class Arguments	{
 			class soundFiles {
 				displayName = "Sounds";

addons/nametags/CfgVehicles.hpp

@@ -7,7 +7,7 @@ class CfgVehicles {
         function = QFUNC(moduleNameTags);
         scope = 2;
         isGlobal = 1;
-        icon = QUOTE(PATHTOF(UI\IconNameTags_ca.paa));
+        icon = QUOTE(PATHTOF(UI\Icon_Module_NameTags_ca.paa));
         class Arguments {
             class PlayerNamesViewDistance {
                 displayName = "Player Names View Dist.";

addons/switchunits/CfgVehicles.hpp

@@ -7,7 +7,7 @@ class CfgVehicles {
     function = FUNC(module);
     scope = 2;
     isGlobal = 1;
-    icon = QUOTE(PATHTOF(UI\IconSwitchUnits_ca.paa));
+    icon = QUOTE(PATHTOF(UI\Icon_Module_SwitchUnits_ca.paa));
     class Arguments {
       class SwitchToWest {
         displayName = "Switch to West?";

addons/vehiclelock/CfgVehicles.hpp

@@ -7,7 +7,7 @@
             statement = QUOTE([ARR_3('VehicleLock_SetVehicleLock', [_target], [ARR_2(_target,false)])] call EFUNC(common,targetEvent)); \
             showDisabled = 0; \
             priority = 0.3; \
-            icon = QUOTE(PATHTOF(ui\key_menuIcon_ca.paa)); \
+            icon = QUOTE(PATHTOF(UI\key_menuIcon_ca.paa)); \
         }; \
         class ACE_lockVehicle { \
             displayName = "$STR_ACE_Vehicle_Action_Lock"; \
@@ -16,7 +16,7 @@
             statement = QUOTE([ARR_3('VehicleLock_SetVehicleLock', [_target], [ARR_2(_target,true)])] call EFUNC(common,targetEvent)); \
             showDisabled = 0; \
             priority = 0.2; \
-            icon = QUOTE(PATHTOF(ui\key_menuIcon_ca.paa)); \
+            icon = QUOTE(PATHTOF(UI\key_menuIcon_ca.paa)); \
         }; \
         class ACE_lockpickVehicle { \
             displayName = "$STR_ACE_Vehicle_Action_Lockpick"; \
@@ -58,7 +58,7 @@ class CfgVehicles {
         function = QUOTE(DFUNC(moduleInit));
         scope = 2;
         isGlobal = 0;
-        icon = QUOTE(PATHTOF(ui\IconLock_ca.paa));
+        icon = QUOTE(PATHTOF(UI\Icon_Module_VehicleLock_ca.paa));
         functionPriority = 0;
         class Arguments {
             class LockVehicleInventory {
@@ -96,7 +96,7 @@ class CfgVehicles {
         function = QUOTE(DFUNC(moduleSync));
         scope = 2;
         isGlobal = 0;
-        icon = QUOTE(PATHTOF(ui\IconLock_ca.paa));
+        icon = QUOTE(PATHTOF(UI\Icon_Module_VehicleKey_ca.paa));
         functionPriority = 0;
         class Arguments {};
         class ModuleDescription: ModuleDescription {

addons/vehiclelock/script_component.hpp

@@ -1,6 +1,6 @@
 #define COMPONENT vehiclelock
 
-#define DEBUG_MODE_FULL
+// #define DEBUG_MODE_FULL
 
 #include "\z\ace\addons\main\script_mod.hpp"
 

addons/winddeflection/CfgVehicles.hpp

@@ -7,7 +7,7 @@ class CfgVehicles {
         function = FUNC(enableModule);
         scope = 2;
         isGlobal = 1;
-        icon = QUOTE(PATHTOF(data\module_icon.paa));
+        icon = QUOTE(PATHTOF(UI\Icon_Module_Wind_ca.paa));
         class Arguments {
             class EnableForAI {
                 displayName = "Enable for AI";

addons/winddeflection/config.cpp

@@ -30,4 +30,4 @@ class ACE_Settings {
 };
 
 #include "CfgEventHandlers.hpp"
-#include "CfgVehicles.h"
+#include "CfgVehicles.hpp"