rename core to common

addons/common/$PBOPREFIX$

@@ -0,0 +1 @@
+z\ace\addons\common

addons/common/CfgVehicles.hpp

@@ -14,8 +14,8 @@ class CfgVehicles {
         showIn3D = 0;
         onlyForPlayer = 1;
         shortcut = "DefaultAction";
-        condition = "call ACE_Core_UserActionFireCondition";
-        statement = "call ACE_Core_UserActionFire";
+        condition = "call ACE_Common_UserActionFireCondition";
+        statement = "call ACE_Common_UserActionFire";
         userActionID = 100;
       };
     };
@@ -26,10 +26,10 @@ class CfgVehicles {
 
   class Module_F;
   class ACE_ModuleCheckPBOs: Module_F {
-    author = "$STR_ACE_Core_ACETeam";
+    author = "$STR_ACE_Common_ACETeam";
     category = "ACE";
     displayName = "Check PBOs";
-    function = "ACE_Core_fnc_moduleCheckPBOs";
+    function = "ACE_Common_fnc_moduleCheckPBOs";
     scope = 2;
     isGlobal = 1;
     icon = PATHTOF(UI\IconCheckPBO_ca.paa);
@@ -81,10 +81,10 @@ class CfgVehicles {
   };
 
   class ACE_ModuleLSDVehicles: Module_F {
-    author = "$STR_ACE_Core_ACETeam";
+    author = "$STR_ACE_Common_ACETeam";
     category = "ACE";
     displayName = "LSD Vehicles";
-    function = "ACE_Core_fnc_moduleLSDVehicles";
+    function = "ACE_Common_fnc_moduleLSDVehicles";
     scope = 2;
     isGlobal = 1;
     class Arguments {
@@ -93,8 +93,8 @@ class CfgVehicles {
 
   class Box_NATO_Support_F;
   class ACE_Box_Misc: Box_NATO_Support_F {
-    author = "$STR_ACE_Core_ACETeam";
-    displayName = "$STR_ACE_Core_MiscItems";
+    author = "$STR_ACE_Common_ACETeam";
+    displayName = "$STR_ACE_Common_MiscItems";
     transportMaxWeapons = 9001;
     transportMaxMagazines = 9001;
     transportMaxItems = 9001;

addons/common/MainMenu.hpp

@@ -29,7 +29,7 @@ class ACE_Tile_Base {
 		right = 0;
 		bottom = 0;
 	};
-	action = "(findDisplay 49) closeDisplay 0; 0 spawn ACE_Core_openMenu;";
+	action = "(findDisplay 49) closeDisplay 0; 0 spawn ACE_Common_openMenu;";
 	animTextureDefault = "#(argb,8,8,3)color(1,1,1,1)";
 	animTextureDisabled = "#(argb,8,8,3)color(1,1,1,1)";
 	animTextureFocused = "#(argb,8,8,3)color(1,1,1,1)";
@@ -61,7 +61,7 @@ class ACE_Tile_Base {
 	soundEscape[] = {"\A3\ui_f\data\sound\RscButtonMenu\soundEscape",0.09,1};
 	soundPush[] = {"\A3\ui_f\data\sound\RscButtonMenu\soundPush",0.09,1};
 	style = "0x02 + 0xC0";
-	text = "$STR_ACE_Core_Options";
+	text = "$STR_ACE_Common_Options";
 	textureNoShortcut = "#(argb,8,8,3)color(0,0,0,0)";
 	tooltip = "";
 	tooltipColorBox[] = {1,1,1,1};

addons/common/MenuConfig.hpp

@@ -3,7 +3,7 @@
 #define VSPACE 0.3
 #define BORDER 0.1
 
-class ACE_Core_Interactive_Button_Base {
+class ACE_Common_Interactive_Button_Base {
   tooltip = "";
   action = "";
 
@@ -46,7 +46,7 @@ class ACE_Core_Interactive_Button_Base {
 #define VSPACE2 0.05
 #define BORDER 0.1
 
-class ACE_Core_Text_Button_Base {
+class ACE_Common_Text_Button_Base {
   idc = 2;
   moving = 0;
   text = "";
@@ -65,10 +65,10 @@ class ACE_Core_Text_Button_Base {
   h = 0;
 };
 
-class ACE_Core_OptionsMenu_Dialog {
+class ACE_Common_OptionsMenu_Dialog {
   idd = -1;
   movingEnable = true;
-  onLoad = "_dlgMenuDialog = _this select 0; for '_a' from 20 to 32 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 100 to 119 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 200 to 219 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 300 to 319 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 400 to 419 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 500 to 519 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; uiNamespace setVariable ['ACE_Core_MenuDialog', _dlgMenuDialog];";
+  onLoad = "_dlgMenuDialog = _this select 0; for '_a' from 20 to 32 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 100 to 119 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 200 to 219 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 300 to 319 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 400 to 419 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 500 to 519 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; uiNamespace setVariable ['ACE_Common_MenuDialog', _dlgMenuDialog];";
   objects[] = {};
 
   class controlsBackground {
@@ -95,7 +95,7 @@ class ACE_Core_OptionsMenu_Dialog {
     class Header {
       idc = 2;
       moving = 0;
-      text = "$STR_ACE_Core_Options";
+      text = "$STR_ACE_Common_Options";
       font = "PuristaMedium";
       sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs";
       lineSpacing = 0;
@@ -112,7 +112,7 @@ class ACE_Core_OptionsMenu_Dialog {
       h = 0.3 / 9 * safezoneH;
     };
 
-    class ACE_Logo : ACE_Core_Interactive_Button_Base {
+    class ACE_Logo : ACE_Common_Interactive_Button_Base {
       action = "closeDialog 0;";
       type = 0;
       style = 48;
@@ -128,7 +128,7 @@ class ACE_Core_OptionsMenu_Dialog {
   };
 
   class controls {
-    class Text_Button0 : ACE_Core_Text_Button_Base {
+    class Text_Button0 : ACE_Common_Text_Button_Base {
       idc = 100;
       style = 0 + 0x800;
       x = (HSPACE2 + 0 * 0.1) * safezoneW + safezoneX;
@@ -234,8 +234,8 @@ class ACE_Core_OptionsMenu_Dialog {
 
     //////////////////////////////////////////////////
 
-    class Interactive_Button0 : ACE_Core_Interactive_Button_Base {
-      action = "ACE_Core_keySet = -1; [0] spawn ACE_Core_editKey";
+    class Interactive_Button0 : ACE_Common_Interactive_Button_Base {
+      action = "ACE_Common_keySet = -1; [0] spawn ACE_Common_editKey";
       sizeEx = "0.8 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs";
       idc = 200;
       style = 2 + 0x800;
@@ -246,115 +246,115 @@ class ACE_Core_OptionsMenu_Dialog {
     };
 
     class Interactive_Button1 : Interactive_Button0 {
-      action = "ACE_Core_keySet = -1; [1] spawn ACE_Core_editKey";
+      action = "ACE_Common_keySet = -1; [1] spawn ACE_Common_editKey";
       idc = 201;
       y = (VSPACE2 + 3 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_Button2 : Interactive_Button0 {
-      action = "ACE_Core_keySet = -1; [2] spawn ACE_Core_editKey";
+      action = "ACE_Common_keySet = -1; [2] spawn ACE_Common_editKey";
       idc = 202;
       y = (VSPACE2 + 4 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_Button3 : Interactive_Button0 {
-      action = "ACE_Core_keySet = -1; [3] spawn ACE_Core_editKey";
+      action = "ACE_Common_keySet = -1; [3] spawn ACE_Common_editKey";
       idc = 203;
       y = (VSPACE2 + 5 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_Button4 : Interactive_Button0 {
-      action = "ACE_Core_keySet = -1; [4] spawn ACE_Core_editKey";
+      action = "ACE_Common_keySet = -1; [4] spawn ACE_Common_editKey";
       idc = 204;
       y = (VSPACE2 + 6 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_Button5 : Interactive_Button0 {
-      action = "ACE_Core_keySet = -1; [5] spawn ACE_Core_editKey";
+      action = "ACE_Common_keySet = -1; [5] spawn ACE_Common_editKey";
       idc = 205;
       y = (VSPACE2 + 7 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_Button6 : Interactive_Button0 {
-      action = "ACE_Core_keySet = -1; [6] spawn ACE_Core_editKey";
+      action = "ACE_Common_keySet = -1; [6] spawn ACE_Common_editKey";
       idc = 206;
       y = (VSPACE2 + 8 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_Button7 : Interactive_Button0 {
-      action = "ACE_Core_keySet = -1; [7] spawn ACE_Core_editKey";
+      action = "ACE_Common_keySet = -1; [7] spawn ACE_Common_editKey";
       idc = 207;
       y = (VSPACE2 + 9 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_Button8 : Interactive_Button0 {
-      action = "ACE_Core_keySet = -1; [8] spawn ACE_Core_editKey";
+      action = "ACE_Common_keySet = -1; [8] spawn ACE_Common_editKey";
       idc = 208;
       y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_Button9 : Interactive_Button0 {
-      action = "ACE_Core_keySet = -1; [9] spawn ACE_Core_editKey";
+      action = "ACE_Common_keySet = -1; [9] spawn ACE_Common_editKey";
       idc = 209;
       y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_Button10 : Interactive_Button0 {
-      action = "ACE_Core_keySet = -1; [10] spawn ACE_Core_editKey";
+      action = "ACE_Common_keySet = -1; [10] spawn ACE_Common_editKey";
       idc = 210;
       y = (VSPACE2 + 12 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_Button11 : Interactive_Button0 {
-      action = "ACE_Core_keySet = -1; [11] spawn ACE_Core_editKey";
+      action = "ACE_Common_keySet = -1; [11] spawn ACE_Common_editKey";
       idc = 211;
       y = (VSPACE2 + 13 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_Button12 : Interactive_Button0 {
-      action = "ACE_Core_keySet = -1; [12] spawn ACE_Core_editKey";
+      action = "ACE_Common_keySet = -1; [12] spawn ACE_Common_editKey";
       idc = 212;
       y = (VSPACE2 + 14 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_Button13 : Interactive_Button0 {
-      action = "ACE_Core_keySet = -1; [13] spawn ACE_Core_editKey";
+      action = "ACE_Common_keySet = -1; [13] spawn ACE_Common_editKey";
       idc = 213;
       y = (VSPACE2 + 15 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_Button14 : Interactive_Button0 {
-      action = "ACE_Core_keySet = -1; [14] spawn ACE_Core_editKey";
+      action = "ACE_Common_keySet = -1; [14] spawn ACE_Common_editKey";
       idc = 214;
       y = (VSPACE2 + 16 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_Button15 : Interactive_Button0 {
-      action = "ACE_Core_keySet = -1; [15] spawn ACE_Core_editKey";
+      action = "ACE_Common_keySet = -1; [15] spawn ACE_Common_editKey";
       idc = 215;
       y = (VSPACE2 + 17 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_Button16 : Interactive_Button0 {
-      action = "ACE_Core_keySet = -1; [16] spawn ACE_Core_editKey";
+      action = "ACE_Common_keySet = -1; [16] spawn ACE_Common_editKey";
       idc = 216;
       y = (VSPACE2 + 18 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_Button17 : Interactive_Button0 {
-      action = "ACE_Core_keySet = -1; [17] spawn ACE_Core_editKey";
+      action = "ACE_Common_keySet = -1; [17] spawn ACE_Common_editKey";
       idc = 217;
       y = (VSPACE2 + 19 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_Button18 : Interactive_Button0 {
-      action = "ACE_Core_keySet = -1; [18] spawn ACE_Core_editKey";
+      action = "ACE_Common_keySet = -1; [18] spawn ACE_Common_editKey";
       idc = 218;
       y = (VSPACE2 + 20 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_Button19 : Interactive_Button0 {
-      action = "ACE_Core_keySet = -1; [19] spawn ACE_Core_editKey";
+      action = "ACE_Common_keySet = -1; [19] spawn ACE_Common_editKey";
       idc = 219;
       y = (VSPACE2 + 21 * 0.04) * safezoneH + safezoneY;
     };
@@ -596,8 +596,8 @@ class ACE_Core_OptionsMenu_Dialog {
 
     //////////////////////////////////////////////////
 
-    class Interactive_CheckboxButton0 : ACE_Core_Interactive_Button_Base {
-      action = "[0] call ACE_Core_toggleState";
+    class Interactive_CheckboxButton0 : ACE_Common_Interactive_Button_Base {
+      action = "[0] call ACE_Common_toggleState";
       idc = 500;
       colorBackground[] = {0, 0, 0, 0};
       colorBackgroundActive[] = {0, 0, 0, 0};
@@ -609,115 +609,115 @@ class ACE_Core_OptionsMenu_Dialog {
     };
 
     class Interactive_CheckboxButton1 : Interactive_CheckboxButton0 {
-      action = "[1] call ACE_Core_toggleState";
+      action = "[1] call ACE_Common_toggleState";
       idc = 501;
       y = (VSPACE2 + 3 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_CheckboxButton2 : Interactive_CheckboxButton0 {
-      action = "[2] call ACE_Core_toggleState";
+      action = "[2] call ACE_Common_toggleState";
       idc = 502;
       y = (VSPACE2 + 4 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_CheckboxButton3 : Interactive_CheckboxButton0 {
-      action = "[3] call ACE_Core_toggleState";
+      action = "[3] call ACE_Common_toggleState";
       idc = 503;
       y = (VSPACE2 + 5 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_CheckboxButton4 : Interactive_CheckboxButton0 {
-      action = "[4] call ACE_Core_toggleState";
+      action = "[4] call ACE_Common_toggleState";
       idc = 504;
       y = (VSPACE2 + 6 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_CheckboxButton5 : Interactive_CheckboxButton0 {
-      action = "[5] call ACE_Core_toggleState";
+      action = "[5] call ACE_Common_toggleState";
       idc = 505;
       y = (VSPACE2 + 7 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_CheckboxButton6 : Interactive_CheckboxButton0 {
-      action = "[6] call ACE_Core_toggleState";
+      action = "[6] call ACE_Common_toggleState";
       idc = 506;
       y = (VSPACE2 + 8 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_CheckboxButton7 : Interactive_CheckboxButton0 {
-      action = "[7] call ACE_Core_toggleState";
+      action = "[7] call ACE_Common_toggleState";
       idc = 507;
       y = (VSPACE2 + 9 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_CheckboxButton8 : Interactive_CheckboxButton0 {
-      action = "[8] call ACE_Core_toggleState";
+      action = "[8] call ACE_Common_toggleState";
       idc = 508;
       y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_CheckboxButton9 : Interactive_CheckboxButton0 {
-      action = "[9] call ACE_Core_toggleState";
+      action = "[9] call ACE_Common_toggleState";
       idc = 509;
       y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_CheckboxButton10 : Interactive_CheckboxButton0 {
-      action = "[10] call ACE_Core_toggleState";
+      action = "[10] call ACE_Common_toggleState";
       idc = 510;
       y = (VSPACE2 + 12 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_CheckboxButton11 : Interactive_CheckboxButton0 {
-      action = "[11] call ACE_Core_toggleState";
+      action = "[11] call ACE_Common_toggleState";
       idc = 511;
       y = (VSPACE2 + 13 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_CheckboxButton12 : Interactive_CheckboxButton0 {
-      action = "[12] call ACE_Core_toggleState";
+      action = "[12] call ACE_Common_toggleState";
       idc = 512;
       y = (VSPACE2 + 14 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_CheckboxButton13 : Interactive_CheckboxButton0 {
-      action = "[13] call ACE_Core_toggleState";
+      action = "[13] call ACE_Common_toggleState";
       idc = 513;
       y = (VSPACE2 + 15 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_CheckboxButton14 : Interactive_CheckboxButton0 {
-      action = "[14] call ACE_Core_toggleState";
+      action = "[14] call ACE_Common_toggleState";
       idc = 514;
       y = (VSPACE2 + 16 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_CheckboxButton15 : Interactive_CheckboxButton0 {
-      action = "[15] call ACE_Core_toggleState";
+      action = "[15] call ACE_Common_toggleState";
       idc = 515;
       y = (VSPACE2 + 17 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_CheckboxButton16 : Interactive_CheckboxButton0 {
-      action = "[16] call ACE_Core_toggleState";
+      action = "[16] call ACE_Common_toggleState";
       idc = 516;
       y = (VSPACE2 + 18 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_CheckboxButton17 : Interactive_CheckboxButton0 {
-      action = "[17] call ACE_Core_toggleState";
+      action = "[17] call ACE_Common_toggleState";
       idc = 517;
       y = (VSPACE2 + 19 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_CheckboxButton18 : Interactive_CheckboxButton0 {
-      action = "[18] call ACE_Core_toggleState";
+      action = "[18] call ACE_Common_toggleState";
       idc = 518;
       y = (VSPACE2 + 20 * 0.04) * safezoneH + safezoneY;
     };
 
     class Interactive_CheckboxButton19 : Interactive_CheckboxButton0 {
-      action = "[19] call ACE_Core_toggleState";
+      action = "[19] call ACE_Common_toggleState";
       idc = 519;
       y = (VSPACE2 + 21 * 0.04) * safezoneH + safezoneY;
     };
@@ -735,7 +735,7 @@ class ACE_Core_OptionsMenu_Dialog {
     };
 
     /*class TextBox_Key_Shift : TextBox_KeyChange {
-      text = "$STR_ACE_Core_Shift";
+      text = "$STR_ACE_Common_Shift";
       idc = 21;
       colorText[] = {0.25,0.25,0.25,1};
       colorBackground[] = {0,0,0,0};
@@ -746,22 +746,22 @@ class ACE_Core_OptionsMenu_Dialog {
     };
 
     class TextBox_Key_Control : TextBox_Key_Shift {
-      text = "$STR_ACE_Core_Ctrl";
+      text = "$STR_ACE_Common_Ctrl";
       idc = 22;
       x = (3 / 4 * HSPACE2 + 6.75 * 0.1) * safezoneW + safezoneX;
       y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY;
     };
 
     class TextBox_Key_Alt : TextBox_Key_Shift {
-      text = "$STR_ACE_Core_Alt";
+      text = "$STR_ACE_Common_Alt";
       idc = 23;
       x = (3 / 4 * HSPACE2 + 7.75 * 0.1) * safezoneW + safezoneX;
       y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY;
     };*/
 
     class TextBox_Key_Shift : Interactive_Button0 {
-      action = "ACE_Core_keyNewTemp = [42, [false, false, false], 42];";
-      text = "$STR_ACE_Core_Shift";
+      action = "ACE_Common_keyNewTemp = [42, [false, false, false], 42];";
+      text = "$STR_ACE_Common_Shift";
       sizeEx = "0.7 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs";
       idc = 21;
       colorText[] = {1,1,1,1};
@@ -773,40 +773,40 @@ class ACE_Core_OptionsMenu_Dialog {
     };
 
     class TextBox_Key_Control : TextBox_Key_Shift {
-      action = "ACE_Core_keyNewTemp = [29, [false, false, false], 29];";
-      text = "$STR_ACE_Core_Ctrl";
+      action = "ACE_Common_keyNewTemp = [29, [false, false, false], 29];";
+      text = "$STR_ACE_Common_Ctrl";
       idc = 22;
       x = (3 / 4 * HSPACE2 + 6.75 * 0.1) * safezoneW + safezoneX;
       y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY;
     };
 
     class TextBox_Key_Alt : TextBox_Key_Shift {
-      action = "ACE_Core_keyNewTemp = [56, [false, false, false], 56];";
-      text = "$STR_ACE_Core_Alt";
+      action = "ACE_Common_keyNewTemp = [56, [false, false, false], 56];";
+      text = "$STR_ACE_Common_Alt";
       idc = 23;
       x = (3 / 4 * HSPACE2 + 7.5 * 0.1) * safezoneW + safezoneX;
       y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY;
     };
 
     class TextBox_Key_Shift_Right : TextBox_Key_Shift {
-      action = "ACE_Core_keyNewTemp = [54, [false, false, false], 54];";
-      text = "$STR_ACE_Core_Shift_Right";
+      action = "ACE_Common_keyNewTemp = [54, [false, false, false], 54];";
+      text = "$STR_ACE_Common_Shift_Right";
       idc = 27;
       x = (3 / 4 * HSPACE2 + 6 * 0.1) * safezoneW + safezoneX;
       y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY;
     };
 
     class TextBox_Key_Control_Right : TextBox_Key_Shift {
-      action = "ACE_Core_keyNewTemp = [157, [false, false, false], 157];";
-      text = "$STR_ACE_Core_Ctrl_Right";
+      action = "ACE_Common_keyNewTemp = [157, [false, false, false], 157];";
+      text = "$STR_ACE_Common_Ctrl_Right";
       idc = 28;
       x = (3 / 4 * HSPACE2 + 6.75 * 0.1) * safezoneW + safezoneX;
       y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY;
     };
 
     class TextBox_Key_Alt_Right : TextBox_Key_Shift {
-      action = "ACE_Core_keyNewTemp = [184, [false, false, false], 184];";
-      text = "$STR_ACE_Core_Alt_Right";
+      action = "ACE_Common_keyNewTemp = [184, [false, false, false], 184];";
+      text = "$STR_ACE_Common_Alt_Right";
       idc = 29;
       x = (3 / 4 * HSPACE2 + 7.5 * 0.1) * safezoneW + safezoneX;
       y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY;
@@ -825,16 +825,16 @@ class ACE_Core_OptionsMenu_Dialog {
     };
 
     class TextBox_Key_Default : TextBox_Key_Shift {
-      action = "call ACE_Core_keysetDefault";
-      text = "$STR_ACE_Core_KeyDefault";
+      action = "call ACE_Common_keysetDefault";
+      text = "$STR_ACE_Common_KeyDefault";
       idc = 31;
       x = (3 / 4 * HSPACE2 + 8.25 * 0.1) * safezoneW + safezoneX;
       y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY;
     };
 
     class TextBox_Key_None : TextBox_Key_Shift {
-      action = "ACE_Core_keyNewTemp = [0, [false, false, false], 0];";
-      text = "$STR_ACE_Core_KeyNone";
+      action = "ACE_Common_keyNewTemp = [0, [false, false, false], 0];";
+      text = "$STR_ACE_Common_KeyNone";
       idc = 32;
       x = (3 / 4 * HSPACE2 + 8.25 * 0.1) * safezoneW + safezoneX;
       y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY;
@@ -853,8 +853,8 @@ class ACE_Core_OptionsMenu_Dialog {
     };
 
     class Interactive_ButtonV : Interactive_Button0 {
-      action = "ACE_Core_keySet = 1";
-      text = "$STR_ACE_Core_Save";
+      action = "ACE_Common_keySet = 1";
+      text = "$STR_ACE_Common_Save";
       sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs";
       idc = 25;
       colorBackground[] = {0,0,0,0};
@@ -865,8 +865,8 @@ class ACE_Core_OptionsMenu_Dialog {
     };
 
     class Interactive_ButtonW : Interactive_ButtonV {
-      action = "ACE_Core_keySet = -1";
-      text = "$STR_ACE_Core_Cancel";
+      action = "ACE_Common_keySet = -1";
+      text = "$STR_ACE_Common_Cancel";
       idc = 26;
       x = (HSPACE2 + 7.5 * 0.1) * safezoneW + safezoneX;
       y = (VSPACE2 + 13 * 0.04) * safezoneH + safezoneY;
@@ -875,8 +875,8 @@ class ACE_Core_OptionsMenu_Dialog {
     };
 
     class Interactive_ButtonX : Interactive_Button0 {
-      action = "ACE_Core_keySave = 1; closeDialog 0";
-      text = "$STR_ACE_Core_Save";
+      action = "ACE_Common_keySave = 1; closeDialog 0";
+      text = "$STR_ACE_Common_Save";
       sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs";
       idc = 10;
       x = ((1 - 2 * HSPACE2 / 2) - (HSPACE2 + 2.5 * 0.1)) * safezoneW + safezoneX;
@@ -886,8 +886,8 @@ class ACE_Core_OptionsMenu_Dialog {
     };
 
     class Interactive_ButtonY : Interactive_Button0 {
-      action = "ACE_Core_keySave = -1; closeDialog 0";
-      text = "$STR_ACE_Core_Cancel";
+      action = "ACE_Common_keySave = -1; closeDialog 0";
+      text = "$STR_ACE_Common_Cancel";
       sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs";
       idc = 11;
       x = ((1 - 2 * HSPACE2 / 2) - (HSPACE2 + 1 * 0.1)) * safezoneW + safezoneX;
@@ -896,9 +896,9 @@ class ACE_Core_OptionsMenu_Dialog {
       h = 0.3 / 9 * safezoneH;
     };
 
-    class Interactive_ButtonA : ACE_Core_Interactive_Button_Base {
-      action = "false call ACE_Core_nextKeys";
-      text = "$STR_ACE_Core_Prev";
+    class Interactive_ButtonA : ACE_Common_Interactive_Button_Base {
+      action = "false call ACE_Common_nextKeys";
+      text = "$STR_ACE_Common_Prev";
       idc = 12;
       style = 2 + 0x800;
       x = (HSPACE2 + 3 * 0.1) * safezoneW + safezoneX;
@@ -908,13 +908,13 @@ class ACE_Core_OptionsMenu_Dialog {
     };
 
     class Interactive_ButtonB : Interactive_ButtonA {
-      action = "true call ACE_Core_nextKeys";
-      text = "$STR_ACE_Core_Next";
+      action = "true call ACE_Common_nextKeys";
+      text = "$STR_ACE_Common_Next";
       idc = 13;
       x = (HSPACE2 + 3 * 0.1 + 2.0 / 16) * safezoneW + safezoneX;
     };
 
-    class Interactive_ButtonC : ACE_Core_Text_Button_Base {
+    class Interactive_ButtonC : ACE_Common_Text_Button_Base {
       text = "";
       idc = 14;
       style = 2 + 0x800;

addons/common/NoVoice.hpp

@@ -206,7 +206,7 @@ class ACE_RadioProtocolNoRadio: RadioProtocolBase {
 
 class CfgVoice {
   class ACE_NoVoice {
-    author = "$STR_ACE_Core_ACETeam";
+    author = "$STR_ACE_Common_ACETeam";
     protocol = "ACE_RadioProtocolNoRadio";
     variants[] = {1};
     directories[] = {"",""};
@@ -214,12 +214,12 @@ class CfgVoice {
     scope = 2;
     voiceType = "";
     icon = "\a3\Ui_f\data\Map\Markers\Flags\nato_ca.paa";
-    displayName = "$STR_ACE_Core_NoVoice";
+    displayName = "$STR_ACE_Common_NoVoice";
   };
 };
 class CfgVoiceTypes {
   class ACE_NoVoice {
-    name = "$STR_ACE_Core_NoVoice";
+    name = "$STR_ACE_Common_NoVoice";
     voices[] = {"ACE_NoVoice","ACE_NoVoice","ACE_NoVoice"};
     preview = "ACE_NoVoice";
     alternative = "";

addons/common/ProgressScreen.hpp

@@ -1,8 +1,8 @@
 
-class ACE_Core_ProgressBar_Dialog {
+class ACE_Common_ProgressBar_Dialog {
   idd = -1;
   movingEnable = false;
-  onLoad = "uiNamespace setVariable ['ACE_Core_ctrlProgressBar', (_this select 0) displayCtrl 1]; uiNamespace setVariable ['ACE_Core_ctrlProgressBarTitle', (_this select 0) displayCtrl 2];";
+  onLoad = "uiNamespace setVariable ['ACE_Common_ctrlProgressBar', (_this select 0) displayCtrl 1]; uiNamespace setVariable ['ACE_Common_ctrlProgressBarTitle', (_this select 0) displayCtrl 2];";
   objects[] = {};
 
   class controlsBackground {
@@ -66,10 +66,10 @@ class ACE_Core_ProgressBar_Dialog {
   };
 };
 
-class ACE_Core_DisableMouse_Dialog {
+class ACE_Common_DisableMouse_Dialog {
   idd = -1;
   movingEnable = false;
-  onLoad = "uiNamespace setVariable ['ACE_Core_dlgDisableMouse', _this select 0];";
+  onLoad = "uiNamespace setVariable ['ACE_Common_dlgDisableMouse', _this select 0];";
   objects[] = {};
   class controlsBackground {
     class Background {

addons/common/RscInfoType.hpp

@@ -23,5 +23,5 @@ class RscDisplayInventory {
 };
 
 class RscDisplayChannel {
-  onLoad = "_this call ACE_Core_fnc_onLoadRscDisplayChannel;";
+  onLoad = QUOTE( _this call GVAR(onLoadRscDisplayChannel) );
 };

addons/common/XEH_postInit.sqf

@@ -1,4 +1,4 @@
-// ACE - Core
+// ACE - Common
 #include "script_component.hpp"
 
 QGVAR(remoteFnc) addPublicVariableEventHandler {
@@ -8,7 +8,7 @@ QGVAR(remoteFnc) addPublicVariableEventHandler {
 [missionNamespace] call FUNC(executePersistent);
 
 // check previous version number from profile
-_currentVersion = getText (configFile >> "CfgPatches" >> "ACE_Core" >> "version");
+_currentVersion = getText (configFile >> "CfgPatches" >> "ACE_Common" >> "version");
 _previousVersion = profileNamespace getVariable ["ACE_VersionNumberString", ""];
 
 if (_currentVersion != _previousVersion) then {

addons/common/XEH_preInit.sqf

@@ -1,7 +1,7 @@
 // by commy2
 #include "script_component.hpp"
 
-// ACE Core Function
+// ACE Common Function
 PREP(addActionEventHandler);
 PREP(addActionMenuEventHandler);
 PREP(addCameraEventHandler);

addons/common/config.cpp

@@ -21,14 +21,6 @@ class CfgPatches {
 #include "CfgVehicles.hpp"
 #include "CfgWeapons.hpp"
 
-class CfgFactionClasses {
-  class PREFIX {
-    displayName = QUOTE(PREFIX);
-    priority = 0.1;
-    side = 7;
-  };
-};
-
 class ACE_Rsc_Display_Base {
   idd = -1;
   type = 0;
@@ -70,7 +62,7 @@ class GVAR(canInteractConditions) {
 
 class GVAR(Options) {
   class enableNumberHotkeys {
-    displayName = "$STR_ACE_Core_EnableNumberHotkeys";
+    displayName = "$STR_ACE_Common_EnableNumberHotkeys";
     default = 1;
   };
 };

addons/common/functions/fnc_addActionEventHandler.sqf

@@ -12,7 +12,7 @@
  * Return value:
  * ID of the action (used to remove it later).
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_unit", "_action", "_condition", "_statement", "_name", "_actionsVar", "_actionID", "_actions", "_id", "_actionIDs"];
 

addons/common/functions/fnc_addActionMenuEventHandler.sqf

@@ -16,7 +16,7 @@
  * Return value:
  * ID of the action (used to remove it later).
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_unit", "_displayName", "_action", "_condition", "_statement", "_condition2", "_statement2", "_priority", "_name", "_actionsVar", "_id", "_actionIDs", "_actions", "_nameVar", "_addAction", "_actionID"];
 

addons/common/functions/fnc_addCameraEventHandler.sqf

@@ -10,7 +10,7 @@
  * Return value:
  * ID of the event script (used to remove it later).
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_statement", "_actionsVar", "_id", "_actionIDs", "_actions"];
 

addons/common/functions/fnc_addCustomEventHandler.sqf

@@ -11,7 +11,7 @@
  * Return value:
  * ID of the event script (used to remove it later).
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_object", "_type", "_statement", "_name", "_actionsVar", "_id", "_actionIDs", "_actions"];
 

addons/common/functions/fnc_addInfoDisplayEventHandler.sqf

@@ -10,7 +10,7 @@
  * Return value:
  * ID of the event script (used to remove it later).
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_type", "_statement", "_actionsVar", "_id", "_actionIDs", "_actions"];
 

addons/common/functions/fnc_addInventoryDisplayLoadedEventHandler.sqf

@@ -9,7 +9,7 @@
  * Return value:
  * ID of the event script (used to remove it later).
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_statement", "_actionsVar", "_id", "_actionIDs", "_actions"];
 

addons/common/functions/fnc_addMapMarkerCreatedEventHandler.sqf

@@ -9,7 +9,7 @@
  * Return value:
  * ID of the event script (used to remove it later).
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_statement", "_actionsVar", "_id", "_actionIDs", "_actions"];
 

addons/common/functions/fnc_addScrollWheelEventHandler.sqf

@@ -9,7 +9,7 @@
  * Return value:
  * ID of the event script (used to remove it later).
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_statement", "_actionsVar", "_id", "_actionIDs", "_actions"];
 

addons/common/functions/fnc_addUnloadEventhandler.sqf

@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private "_dlg";
 

addons/common/functions/fnc_adminKick.sqf

@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private "_name";
 

addons/common/functions/fnc_ambientBrightness.sqf

@@ -9,6 +9,6 @@
  * Return value:
  * Ambient brightness (Number)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 sunOrMoon * sunOrMoon + moonIntensity/5 min 1

addons/common/functions/fnc_applyForceWalkStatus.sqf

@@ -15,7 +15,7 @@ Returns:
 Example:
   [ACE_Player] call FUNC(applyForceWalkStatus)
 */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_unit", "_forceWalkNumber"];
 

addons/common/functions/fnc_binarizeNumber.sqf

@@ -10,7 +10,7 @@
  * Return value:
  * Booleans (Array)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_number", "_minLength", "_array", "_index", "_rest"];
 

addons/common/functions/fnc_callCustomEventHandlers.sqf

@@ -11,7 +11,7 @@
  * Return value:
  * None.
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_object", "_type", "_argument", "_name", "_actions"];
 

addons/common/functions/fnc_callCustomEventHandlersGlobal.sqf

@@ -11,6 +11,6 @@
  * Return value:
  * None.
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 [_this, QUOTE(FUNC(callCustomEventHandlers)), 2] call FUNC(execRemoteFnc);

addons/common/functions/fnc_canGetInPosition.sqf

@@ -14,7 +14,7 @@
  * Return Value:
  * Nothing
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 #define CANGETINDRIVER      (isNull (driver _vehicle)             || {!alive driver _vehicle})               && {!lockedDriver _vehicle}           && {getNumber (_config >> "isUav") != 1}
 #define CANGETINTURRETINDEX (isNull (_vehicle turretUnit _turret) || {!alive (_vehicle turretUnit _turret)}) && {!(_vehicle lockedTurret _turret)} && {getNumber (_config >> "isUav") != 1}

addons/common/functions/fnc_canInteractWith.sqf

@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_unit", "_target", "_owner"];
 

addons/common/functions/fnc_canUseWeapon.sqf

@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 // returns true if the unit is on foot or in a ffv position
 

addons/common/functions/fnc_changeProjectileDirection.sqf

@@ -12,7 +12,7 @@
  * Return value:
  * None.
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_projectile", "_adjustDir", "_adjustUp", "_adjustSpeed", "_vdir", "_dir", "_up", "_l", "_r", "_vup", "_vel"];
 

addons/common/functions/fnc_checkPBOs.sqf

@@ -14,7 +14,7 @@
  * Return value:
  * None.
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_mode", "_checkAll", "_whitelist", "_logic"];
 

addons/common/functions/fnc_claim.sqf

@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_unit", "_target", "_lockTarget", "_owner"];
 

addons/common/functions/fnc_closeDialogIfTargetMoves.sqf

@@ -10,7 +10,7 @@
  * Return Value:
  * None
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 _this spawn {
   _target = _this select 0;

addons/common/functions/fnc_codeToLetter.sqf

@@ -1,4 +1,4 @@
 // by commy2
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 ["", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"] select ([2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 30, 48, 46, 32, 18, 33, 34, 35, 23, 36, 37, 38, 50, 49, 24, 25, 16, 19, 31, 20, 22, 47, 17, 45, 44, 21] find (_this select 0)) + 1

addons/common/functions/fnc_codeToString.sqf

@@ -9,7 +9,7 @@
  * Return value:
  * Code (String)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private "_function";
 

addons/common/functions/fnc_convertKeyCode.sqf

@@ -12,7 +12,7 @@
  * Return value:
  * Key code (Number)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 #define KEY_MODIFIERS [42, 54, 29, 157, 56, 184]
 

addons/common/functions/fnc_currentChannel.sqf

@@ -9,7 +9,7 @@
  * Return value:
  * The current channel. Can be "group", "side", "global", "command", "vehicle" or "direct" (String)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 #define CHANNELS ["group", "side", "global", "command", "vehicle", "direct"]
 #define CHANNELS_LOCALIZED [localize "str_channel_group", localize "str_channel_side", localize "str_channel_global", localize "str_channel_command", localize "str_channel_vehicle", localize "str_channel_direct"]

addons/common/functions/fnc_disableUserInput.sqf

@@ -9,7 +9,7 @@
  * Return value:
  * Nothing
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_state", "_dlg"];
 

addons/common/functions/fnc_displayText.sqf

@@ -12,7 +12,7 @@
  * Return value:
  * Nothing
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 #define DEFAULT_PLAY_SOUND false
 #define DEFAULT_DELAY 2

addons/common/functions/fnc_displayTextPicture.sqf

@@ -10,7 +10,7 @@
  * Return value:
  * Nothing
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_text", "_image"];
 

addons/common/functions/fnc_displayTextStructured.sqf

@@ -10,7 +10,7 @@
  * Return value:
  * Nothing
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_text", "_size", "_isShown", "_ctrlHint"];
 

addons/common/functions/fnc_doAnimation.sqf

@@ -14,7 +14,7 @@
  * Return value:
  * Nothing
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_unit", "_animation", "_priority", "_force"];
 

addons/common/functions/fnc_endRadioTransmission.sqf

@@ -10,7 +10,7 @@
  * None.
  *
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 // ACRE
 if (isClass (configFile >> "CfgPatches" >> "acre_main")) then {

addons/common/functions/fnc_execPersistentFnc.sqf

@@ -12,7 +12,7 @@
  * Return value:
  * Nothing.
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_arguments", "_function", "_unit", "_name"];
 

addons/common/functions/fnc_execRemoteFnc.sqf

@@ -15,7 +15,7 @@
  * Return value:
  * Nothing
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_arguments", "_function", "_unit", "_id"];
 

addons/common/functions/fnc_executePersistent.sqf

@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private "_target";
 

addons/common/functions/fnc_exportConfig.sqf

@@ -4,7 +4,7 @@
 
 	(configFile >> "CfgAmmo") call FUNC(exportConfig);
 */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private "_fnc_logEntries";
 

addons/common/functions/fnc_filter.sqf

@@ -13,7 +13,7 @@
  * Usage:
  * [[0,1,2,3,4], {_this > 2}] call FUNC(filter) ==> [3,4]
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_array", "_code", "_newArray", "_index"];
 

addons/common/functions/fnc_fixCrateContent.sqf

@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_crate", "_weapons", "_items"];
 

addons/common/functions/fnc_fixLoweredRifleAnimation.sqf

@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private "_unit";
 

addons/common/functions/fnc_getCaptivityStatus.sqf

@@ -9,7 +9,7 @@
  * Return value:
  * Reasons, why the unit is a captive. An empty array is returned if the unit is not a captive (Array of Strings)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_unit", "_captivityReasons", "_unitCaptivityStatus", "_unitCaptivityReasons"];
 

addons/common/functions/fnc_getChildren.sqf

@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_name", "_cfgClass", "_classes"];
 

addons/common/functions/fnc_getConfigCommander.sqf

@@ -9,7 +9,7 @@
  * Return value:
  * Commander config (Config)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_vehicle", "_config", "_turret"];
 

addons/common/functions/fnc_getConfigGunner.sqf

@@ -9,7 +9,7 @@
  * Return value:
  * Gunner config (Config)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_vehicle", "_config", "_turret"];
 

addons/common/functions/fnc_getDefaultAnim.sqf

@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_unit", "_anim", "_stance"];
 

addons/common/functions/fnc_getDisplayConfigName.sqf

@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_configName", "_index"];
 

addons/common/functions/fnc_getDoorTurrets.sqf

@@ -9,7 +9,7 @@
  * Return value:
  * Turret indexes of the door gunner. Empty array means no gunner position. (Array)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_vehicleType", "_turrets", "_doorTurrets", "_config"];
 

addons/common/functions/fnc_getForceWalkStatus.sqf

@@ -15,7 +15,7 @@ Returns:
 Example:
   [ACE_Player] call FUNC(getForceWalkStatus)
 */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_unit", "_forceWalkReasons", "_unitForceWalkNumber", "_unitForceWalkStatus", "_unitForceWalkReasons"];
 

addons/common/functions/fnc_getHitPoints.sqf

@@ -9,7 +9,7 @@
  * Return Value:
  * The hitpoints (Array)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_vehicle", "_config", "_hitpoints"];
 

addons/common/functions/fnc_getHitPointsWithSelections.sqf

@@ -9,7 +9,7 @@
  * Return Value:
  * The hitpoints with selections. Format: [hitpoints, selections]. They correspond by index. (Array)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_vehicle", "_config", "_hitpoints", "_selections"];
 

addons/common/functions/fnc_getInPosition.sqf

@@ -13,7 +13,7 @@
  * Return Value:
  * Nothing
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 #define CANGETINDRIVER      (isNull (driver _vehicle)             || {!alive driver _vehicle})               && {!lockedDriver _vehicle}           && {getNumber (_config >> "isUav") != 1}
 #define CANGETINTURRETINDEX (isNull (_vehicle turretUnit _turret) || {!alive (_vehicle turretUnit _turret)}) && {!(_vehicle lockedTurret _turret)} && {getNumber (_config >> "isUav") != 1}

addons/common/functions/fnc_getMarkerType.sqf

@@ -9,7 +9,7 @@
  * Return Value:
  * Marker Type (string)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 _group = _this select 0;
 _leader = leader _group;

addons/common/functions/fnc_getName.sqf

@@ -10,7 +10,7 @@
  * Return value:
  * The name.
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_unit", "_showEffective", "_name"];
 

addons/common/functions/fnc_getNumberFromMissionSQM.sqf

@@ -9,7 +9,7 @@
  * Return value:
  * Value of the entry. Note: If the entry does not exist, it might return 0 or an entry with the same name of another class! (Number)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private "_number";
 

addons/common/functions/fnc_getPitchBankYaw.sqf

@@ -9,6 +9,6 @@
  * Return Value:
  * [pitch, bank, yaw]
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 ((_this select 0) call BIS_fnc_getPitchBank) + [getDir (_this select 0)]

addons/common/functions/fnc_getStringFromMissionSQM.sqf

@@ -9,7 +9,7 @@
  * Return value:
  * Value of the entry. Note: If the entry does not exist, it might return an empty string or an entry with the same name of another class! (String)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_path", "_mission", "_a", "_class", "_index", "_array", "_b", "_entry"];
 

addons/common/functions/fnc_getTargetAzimuthAndInclination.sqf

@@ -10,7 +10,7 @@
  * 0: Azimuth (Number)
  * 1: Inclination or 'slope' (Number)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_position", "_direction", "_azimuth", "_inclination"];
 

addons/common/functions/fnc_getTargetDistance.sqf

@@ -11,7 +11,7 @@
  * Return value:
  * Measured distance in meters. Can return maximal or minimal distance (Number)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_interval", "_maxDistance", "_minDistance", "_position", "_laser", "_line", "_distance", "_iteration"];
 

addons/common/functions/fnc_getTargetObject.sqf

@@ -9,7 +9,7 @@
  * Return value:
  * Nearest object directly in line of sight, if none objNull (Object)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_maxDistance", "_position", "_laser", "_intersects"];
 

addons/common/functions/fnc_getTurretCommander.sqf

@@ -9,7 +9,7 @@
  * Return value:
  * Turret index of the vehicles commander. Empty array means no observer position. (Array)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_vehicle", "_turrets", "_turret", "_config"];
 

addons/common/functions/fnc_getTurretConfigPath.sqf

@@ -10,7 +10,7 @@
  * Return value:
  * Turret config (Config)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_config", "_turretIndex", "_index", "_offset", "_config2", "_foundClasses"];
 

addons/common/functions/fnc_getTurretCopilot.sqf

@@ -9,7 +9,7 @@
  * Return value:
  * Turret index of the vehicles gunner. Empty array means no copilot position. (Array)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_vehicle", "_turrets", "_turret", "_config"];
 

addons/common/functions/fnc_getTurretGunner.sqf

@@ -9,7 +9,7 @@
  * Return value:
  * Turret index of the vehicles gunner. Empty array means no gunner position. (Array)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_vehicle", "_turrets", "_turret", "_config"];
 

addons/common/functions/fnc_getTurretIndex.sqf

@@ -9,7 +9,7 @@
  * Return value:
  * Turret index array or config path. E.g: [0] for gunner or [0,0] for commander. Returns empty array if unit is not in a turret. (Array)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_unit", "_vehicle", "_turrets", "_units", "_index"];
 

addons/common/functions/fnc_getTurrets.sqf

@@ -9,7 +9,7 @@
  * Return value:
  * All turret index arrays of the vehicle. E.g: [[0], [0,0]] (Array)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_type", "_config", "_turrets", "_fnc_addTurret"];
 

addons/common/functions/fnc_getTurretsFFV.sqf

@@ -9,7 +9,7 @@
  * Return value:
  * Turret index of the vehicles gunner. Empty array means no ffv turrets. (Array)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_vehicle", "_turrets", "_turret", "_config"];
 

addons/common/functions/fnc_getTurretsOther.sqf

@@ -9,7 +9,7 @@
  * Return value:
  * Turret index of the vehicles gunner. Empty array means no other turrets. (Array)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_vehicle", "_turrets", "_turret", "_config"];
 

addons/common/functions/fnc_getUavControlPosition.sqf

@@ -18,7 +18,7 @@ Returns:
 Example:
   [ACE_Player] call FUNC(getUavControlPosition)
 */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_unit", "_uav", "_positionArray", "_playerIndex"];
 

addons/common/functions/fnc_getVehicleCargo.sqf

@@ -9,7 +9,7 @@
  * Return value:
  * Vehicle cargo positions. (Array)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_vehicle", "_config", "_cargo", "_codrivers"];
 

addons/common/functions/fnc_getVehicleCodriver.sqf

@@ -9,7 +9,7 @@
  * Return value:
  * Vehicle codriver positions. (Array)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_vehicle", "_config", "_cargo", "_codrivers"];
 

addons/common/functions/fnc_getVehicleCrew.sqf

@@ -10,7 +10,7 @@
  * Return value:
  * Crew (Array)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_vehicle", "_types", "_crew"];
 

addons/common/functions/fnc_getWeaponAzimuthAndInclination.sqf

@@ -10,7 +10,7 @@
  * 0: Azimuth (Number)
  * 1: Inclination or 'slope' (Number)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_weapon", "_direction", "_azimuth", "_inclination"];
 

addons/common/functions/fnc_getWeaponType.sqf

@@ -9,7 +9,7 @@
  * Return value:
  * Slot index of the given class name, 1: primary, 2: secondary, 3: handgun, else: -1 (Number)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_weapon", "_type", "_index"];
 

addons/common/functions/fnc_getWindDirection.sqf

@@ -9,7 +9,7 @@
  * Return value:
  * Wind direction. (String)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 switch (round (windDir / 360 * 16)) do {
   case 1 :  {localize QUOTE(DOUBLES(STR,GVAR(SSW)))};

addons/common/functions/fnc_goKneeling.sqf

@@ -9,7 +9,7 @@
  * Return value:
  * None.
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private "_unit";
 

addons/common/functions/fnc_hadamardProduct.sqf

@@ -11,7 +11,7 @@
  * Return Value:
  * Hadamard Product
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 _vector1 = _this select 0;
 _vector2 = _this select 1;

addons/common/functions/fnc_inTransitionAnim.sqf

@@ -1,4 +1,4 @@
 // by commy2
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> animationState (_this select 0) >> "looped") == 0

addons/common/functions/fnc_interpolateFromArray.sqf

@@ -1,5 +1,5 @@
 // by commy2
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 private ["_array", "_value", "_min", "_max"];
 

addons/common/functions/fnc_isAutoWind.sqf

@@ -9,6 +9,6 @@
  * Return value:
  * This mission has automatic wind? (Bool)
  */
-#include "\z\ace\addons\core\script_component.hpp"
+#include "\z\ace\addons\common\script_component.hpp"
 
 ["Mission", "Intel", "windForced"] call FUNC(getNumberFromMissionSQM) != 1