Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3.git into agmInteractionPort

.gitignore

@@ -0,0 +1,2 @@
+*.pbo
+

AUTHORS.txt

@@ -0,0 +1,57 @@
+# ACE 3 CONTRIBUTOR LIST
+# If you contributed, but are not listed here, contact me:
+# koffeinflummi@gmail.com
+#
+# Feel free to add yourself to this when creating a pull
+# request, preferably including an email address.
+
+# CORE TEAM
+commy2
+esteldunedain <nicolas.d.badano@gmail.com>
+Felix Wiegand <koffeinflummi@gmail.com>
+Garth "L-H" de Wet <garthofhearts@gmail.com>
+Jo David
+PabstMirror
+
+# CONTRIBUTORS
+11RDP-LoupVert <loupvert@11rdp.fr>
+[BIG]Bull
+ACCtomeek
+Adanteh
+aeroson
+Aggr094 <bastards4glory@gmail.com>
+BlackQwar
+Brakoviejo
+Codingboy
+Crusty
+eRazeri
+evromalarkey <evromalarkey@gmail.com>
+Falke75
+Ferenczi
+Ferenzi
+Filip Basara <filip.basara93@googlemail.com> (Logo)
+geraldbolso1899
+Ghost
+gienkov
+gpgpgpgp
+Grzegorz
+Hamburger SV
+havena <silveredenis@gmail.com>
+Hawkins
+jokoho48
+Jonpas <jonpas33@gmail.com>
+Legolasindar
+licht-im-Norden87
+MarcBook
+Michail Nikolaev
+nic547 <nic547@outlook.com>
+oscarmolinadev
+pokertour
+rakowozz
+Raspu86
+Riccardo Petricca <petriccarcc@gmail.com>
+Robert Boklahánics <bokirobi@gmail.com>
+simon84
+Tonic
+Tourorist <tourorist@gmail.com>
+Valentin Torikian <valentin.torikian@gmail.com>

addons/ai/$PBOPREFIX$

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

addons/ai/config.cpp

@@ -1,5 +1,7 @@
+#include "script_component.hpp"
+
 class CfgPatches {
-  class AGM_AI {
+  class ADDON {
     units[] = {};
     weapons[] = {};
     requiredVersion = 0.60;
@@ -60,24 +62,29 @@ class CfgWeapons {
     aiDispersionCoefX = 6;
     aiDispersionCoefY = 6;
   };
+
   class Rifle_Base_F: Rifle {};
   class Rifle_Long_Base_F: Rifle_Base_F {};
 
+  // MX
   class arifle_MX_Base_F: Rifle_Base_F {
     aiDispersionCoefY = 18.0;
     aiDispersionCoefX = 12.0;
-    modes[] = {"Single","FullAuto","fullauto_medium","single_medium_optics1","single_far_optics2","AGM_Burst_far"};
+    modes[] += {"AGM_Burst_far"};
+
     class Single: Mode_SemiAuto {
       minRange = 120;       // 2;
       minRangeProbab = 0.7; // 0.5;
       midRange = 300;       // 200;
       midRangeProbab = 0.5; // 0.7;
     };
+
     class FullAuto;
     class fullauto_medium: FullAuto {
       minRange = 20;        // 2;
       burst = "3 + round random 5"; //3;
     };
+
     class AGM_Burst_far: fullauto_medium {
       aiRateOfFire = 2.0;
       aiRateOfFireDistance = 500;
@@ -89,11 +96,13 @@ class CfgWeapons {
       maxRangeProbab = 0.2;
       burst = "2 + round random 3";
     };
+
     class single_medium_optics1: Single {
       aiRateOfFireDistance = 700; // 600;
       minRange = 120;             // 2;
       maxRange = 700;             // 600;
     };
+
     class single_far_optics2: single_medium_optics1 {
       aiRateOfFireDistance = 900; // 700;
       minRange = 200;             // 100;
@@ -101,20 +110,24 @@ class CfgWeapons {
     };
   };
 
+  // MX carbine
   class arifle_MXC_F: arifle_MX_Base_F {
     aiDispersionCoefY = 18.0;
     aiDispersionCoefX = 12.0;
+
     class Single: Single {
       minRange = 120;       // 2;
       minRangeProbab = 0.5; // 0.3;
       midRange = 250;       // 150;
       midRangeProbab = 0.3; // 0.5;
     };
+
     class FullAuto;
     class fullauto_medium: fullauto_medium {
       minRange = 20;       // 2;
       burst = "3 + round random 5"; //3;
     };
+
     class AGM_Burst_far: fullauto_medium {
       aiRateOfFire = 2.0;
       aiRateOfFireDistance = 400;
@@ -126,11 +139,13 @@ class CfgWeapons {
       maxRangeProbab = 0.2;
       burst = "2 + round random 3";
     };
+
     class single_medium_optics1: single_medium_optics1 {
       aiRateOfFireDistance = 600; // 500;
       minRange = 120;             // 2;
       maxRange = 600;             // 500;
     };
+
     class single_far_optics2: single_medium_optics1 {
       aiRateOfFireDistance = 800; // 700;
       minRange = 200;             // 100;
@@ -141,6 +156,7 @@ class CfgWeapons {
   //class arifle_MX_F: arifle_MX_Base_F {};
   //class arifle_MX_GL_F: arifle_MX_Base_F {};
 
+  // MX machine gun
   class arifle_MXM_F: arifle_MX_Base_F {
     class Single: Single {
       minRange = 120;       // 2;
@@ -148,15 +164,18 @@ class CfgWeapons {
       midRange = 350;       // 250;
       midRangeProbab = 0.5; // 0.7;
     };
+
     class fullauto_medium: fullauto_medium {
       minRange = 20;        // 2;
       burst = "3 + round random 5"; //3;
     };
+
     class single_medium_optics1: single_medium_optics1 {
       aiRateOfFireDistance = 700; // 600;
       minRange = 120;             // 2;
       maxRange = 750;             // 650;
     };
+
     class single_far_optics2: single_far_optics2 {
       aiRateOfFireDistance = 900; // 800;
       minRange = 200;             // 100;
@@ -164,13 +183,16 @@ class CfgWeapons {
     };
   };
 
+  // MX sniper rifle
   class arifle_MX_SW_F: arifle_MX_Base_F {
     aiDispersionCoefY = 24.0;
     aiDispersionCoefX = 21.0;
-    modes[] = {"Single","manual","close","short","medium","far_optic1","far_optic2","AGM_Burst_far"};
+    modes[] += {"AGM_Burst_far"};
+
     class Single: Mode_SemiAuto {
       minRange = 120;             // 2;
     };
+
     class close;
     class medium;
     class AGM_Burst_far: medium {
@@ -184,31 +206,37 @@ class CfgWeapons {
       maxRangeProbab = 0.2;
       burst = "3 + round random 5";
     };
+
     class far_optic1: close {
       aiRateOfFireDistance = 750; // 650;
       maxRange = 750;             // 650;
     };
+
     class far_optic2: far_optic1 {
       maxRange = 1100;            // 900;
       aiRateOfFireDistance = 1100;// 900;
     };
   };
 
+  // Katiba
   class arifle_Katiba_Base_F: Rifle_Base_F {
     aiDispersionCoefY = 18.0;
     aiDispersionCoefX = 12.0;
-    modes[] = {"Single","FullAuto","single_medium_optics1","single_far_optics2","fullauto_medium","AGM_Burst_far"};
+    modes[] += {"AGM_Burst_far"};
+
     class Single: Mode_SemiAuto {
       minRange = 120;       // 2;
       minRangeProbab = 0.7; // 0.5;
       midRange = 300;       // 200;
       midRangeProbab = 0.5; // 0.7;
     };
+
     class FullAuto;
     class fullauto_medium: FullAuto {
       minRange = 20;       // 2;
       burst = "3 + round random 5"; //3;
     };
+
     class AGM_Burst_far: fullauto_medium {
       aiRateOfFire = 2.0;
       aiRateOfFireDistance = 500;
@@ -220,32 +248,40 @@ class CfgWeapons {
       maxRangeProbab = 0.2;
       burst = "2 + round random 3";
     };
+
     class single_medium_optics1: Single {
       aiRateOfFireDistance = 700; // 600;
       minRange = 120;             // 2;
       maxRange = 700;             // 600;
     };
+
     class single_far_optics2: single_medium_optics1 {
       aiRateOfFireDistance = 900; // 800;
       minRange = 200;             // 100;
       maxRange = 900;             // 800;
     };
   };
+
+  // Katiba carbine
   class arifle_Katiba_C_F: arifle_Katiba_Base_F {
     aiDispersionCoefY = 18.0;
     aiDispersionCoefX = 12.0;
+
     class Single: Single {
       minRange = 120;       // 2;
       minRangeProbab = 0.5; // 0.3;
       midRange = 250;       // 150;
       midRangeProbab = 0.3; // 0.7;
     };
+
     //class FullAuto: FullAuto {};
+
     class fullauto_medium: fullauto_medium {
       minRange = 20;       // 2;
       maxRange = 150;      //100;
       burst = "3 + round random 5"; //3;
     };
+
     class AGM_Burst_far: fullauto_medium {
       aiRateOfFire = 2.0;
       aiRateOfFireDistance = 400;
@@ -257,10 +293,12 @@ class CfgWeapons {
       maxRangeProbab = 0.2;
       burst = "2 + round random 3";
     };
+
     class single_medium_optics1: single_medium_optics1 {
       minRange = 120;     // 2;
       maxRange = 600;     // 500;
     };
+
     class single_medium_optics2: single_medium_optics1 {
       aiRateOfFireDistance = 800; // 700;
       minRange = 200;             // 100;
@@ -268,24 +306,29 @@ class CfgWeapons {
     };
   };
 
+  // F2002
   class mk20_base_F: Rifle_Base_F {
     aiDispersionCoefY = 18.0;
     aiDispersionCoefX = 12.0;
-    modes[] = {"Single","FullAuto","fullauto_medium","single_medium_optics1","single_far_optics2","AGM_Burst_far"};
+    modes[] += {"AGM_Burst_far"};
+
     class Single: Mode_SemiAuto {
       minRange = 120;       // 2;
       minRangeProbab = 0.7; // 0.5;
       midRange = 250;       // 150;
       midRangeProbab = 0.5; // 0.7;
     };
+
     class FullAuto: Mode_FullAuto {
       minRange = 0; //2;
     };
+
     class fullauto_medium: FullAuto {
       minRange = 20;                // 2;
       maxRange = 150;               // 100;
       burst = "3 + round random 5"; // 3;
     };
+
     class AGM_Burst_far: fullauto_medium {
       aiRateOfFire = 2.0;
       aiRateOfFireDistance = 500;
@@ -297,20 +340,25 @@ class CfgWeapons {
       maxRangeProbab = 0.2;
       burst = "2 + round random 3";
     };
+
     class single_medium_optics1: Single {
       aiRateOfFireDistance = 600; // 500;
       minRange = 120;             // 5;
       maxRange = 600;             // 500;
     };
+
     class single_far_optics2: single_medium_optics1 {
       aiRateOfFireDistance = 800; // 700;
       minRange = 200;             // 100;
       maxRange = 800;             // 700;
     };
   };
+
+  // F2002 carbine
   class arifle_Mk20C_F: mk20_base_F {
     aiDispersionCoefY = 18.0;
     aiDispersionCoefX = 12.0;
+
     class Single: Single {
       minRange = 120;       // 2;
       minRangeProbab = 0.7; // 0.5;
@@ -318,19 +366,23 @@ class CfgWeapons {
       midRangeProbab = 0.5; // 0.7;
       maxRange = 350;       // 250;
     };
+
     class FullAuto: FullAuto {
       minRange = 0; //2;
     };
+
     class single_medium_optics1: single_medium_optics1 {
       aiRateOfFireDistance = 600; // 500;
       minRange = 120;             // 5;
       maxRange = 550;             // 450;
     };
+
     //class single_medium_optics2: single_medium_optics1 {};
     class fullauto_medium: fullauto_medium {
       minRange = 20;                //2;
       burst = "3 + round random 5"; //3;
     };
+
     class AGM_Burst_far: fullauto_medium {
       aiRateOfFire = 2.0;
       aiRateOfFireDistance = 400;
@@ -344,11 +396,12 @@ class CfgWeapons {
     };
   };
 
+  // TAR-20
   class Tavor_base_F: Rifle_Base_F {
     aiDispersionCoefY = 18.0;
     aiDispersionCoefX = 12.0;
+    modes[] += {"AGM_Burst_far"};
 
-    modes[] = {"Single","FullAuto","single_medium_optics1","single_medium_optics2","fullauto_medium","AGM_Burst_far"};
     class Single: Mode_SemiAuto {
       minRange = 120;       //2;
       minRangeProbab = 0.7; //0.5;
@@ -356,14 +409,17 @@ class CfgWeapons {
       midRangeProbab = 0.5; //0.7;
       maxRange = 350;       //250;
     };
+
     class FullAuto: Mode_FullAuto {
       minRange = 0; //2;
     };
+
     class fullauto_medium: FullAuto {
       minRange = 20;                // 2;
       maxRange = 150;               // 100;
       burst = "3 + round random 5"; // 3;
     };
+
     class AGM_Burst_far: fullauto_medium {
       aiRateOfFire = 2.0;
       aiRateOfFireDistance = 400;
@@ -375,20 +431,25 @@ class CfgWeapons {
       maxRangeProbab = 0.2;
       burst = "2 + round random 3";
     };
+
     class single_medium_optics1: Single {
       aiRateOfFireDistance = 600; // 500;
       minRange = 120;             // 5;
       maxRange = 550;             // 450;
     };
+
     class single_medium_optics2: single_medium_optics1 {
       aiRateOfFireDistance = 700; // 600;
       minRange = 200;             // 100;
       maxRange = 700;             // 600;
     };
   };
+
+  // TAR-21
   class arifle_TRG21_F: Tavor_base_F {
     aiDispersionCoefY = 18.0;
     aiDispersionCoefX = 12.0;
+
     class Single: Single {
       minRange = 120;        // 2;
       minRangeProbab = 0.7;  // 0.3;
@@ -396,24 +457,17 @@ class CfgWeapons {
       midRangeProbab = 0.5;  // 0.7;
       maxRange = 400;        // 300;
     };
+
     class FullAuto: FullAuto {
       minRange = 0; //2;
     };
+
     class fullauto_medium: fullauto_medium {
       minRange = 20;                // 2;
       maxRange = 150;               // 100;
       burst = "3 + round random 5"; // 3;
     };
-    class single_medium_optics1: single_medium_optics1 {
+
-      aiRateOfFireDistance = 700; // 600;
-      minRange = 120;             // 2;
-      maxRange = 600;             // 500;
-    };
-    class single_medium_optics2: single_medium_optics1 {
-      aiRateOfFireDistance = 800; // 700;
-      minRange = 200;             // 100;
-      maxRange = 800;             // 700;
-    };
     class AGM_Burst_far: fullauto_medium {
       aiRateOfFire = 2.0;
       aiRateOfFireDistance = 400;
@@ -425,58 +479,86 @@ class CfgWeapons {
       maxRangeProbab = 0.2;
       burst = "2 + round random 3";
     };
+
+    class single_medium_optics1: single_medium_optics1 {
+      aiRateOfFireDistance = 700; // 600;
+      minRange = 120;             // 2;
+      maxRange = 600;             // 500;
+    };
+
+    class single_medium_optics2: single_medium_optics1 {
+      aiRateOfFireDistance = 800; // 700;
+      minRange = 200;             // 100;
+      maxRange = 800;             // 700;
+    };
   };
 
   // sub machine guns
+
+  // SDAR
   class SDAR_base_F: Rifle_Base_F {
     aiDispersionCoefY = 28.0;
     aiDispersionCoefX = 20.0;
+
     class Single: Mode_SemiAuto {
       minRange = 10;  //2;
     };
+
     class Burst: Mode_Burst {
       minRange = 5;   //1;
     };
   };
 
+  // PD2000
   class pdw2000_base_F: Rifle_Base_F {
     aiDispersionCoefY = 18.0;
     aiDispersionCoefX = 12.0;
+
     class Single: Mode_SemiAuto {
       minRange = 100; //2;
     };
+
     class Burst: Mode_Burst {
       minRange = 50;  //1;
     };
   };
 
+  // Vector
   class SMG_01_Base: Rifle_Base_F {
     aiDispersionCoefY = 18.0;
     aiDispersionCoefX = 12.0;
+
     class Single: Mode_SemiAuto {
       minRange = 50;  //2;
     };
+
     class Burst: Mode_Burst {
       minRange = 25;  //2;
     };
   };
 
+  // Scorpion EVO
   class SMG_02_base_F: Rifle_Base_F {
     aiDispersionCoefY = 18.0;
     aiDispersionCoefX = 12.0;
+
     class Single: Mode_SemiAuto {
       minRange = 50;  //2;
     };
+
     class Burst: Mode_Burst {
       minRange = 25;  //2;
     };
   };
 
   // machine guns
+
+  // Stoner
   class LMG_Mk200_F: Rifle_Long_Base_F {
     aiDispersionCoefY = 24.0;
     aiDispersionCoefX = 21.0;
-    modes[] = {"manual","close","short","medium","far_optic1","far_optic2","AGM_Burst_far"};
+    modes[] += {"AGM_Burst_far"};
+
     class medium;
     class AGM_Burst_far: medium {
       aiRateOfFire = 6.0;
@@ -489,22 +571,27 @@ class CfgWeapons {
       maxRangeProbab = 0.2;
       burst = "3 + round random 5";
     };
+
     class far_optic1: medium {
       maxRange = 750;             // 650;
     };
+
     class far_optic2: far_optic1 {
       maxRange = 1100;            // 900;
       aiRateOfFireDistance = 1100;// 900;
     };
   };
 
+  // Negev
   class LMG_Zafir_F: Rifle_Long_Base_F {
     aiDispersionCoefY = 23.0;
     aiDispersionCoefX = 19.0;
-    modes[] = {"Single","FullAuto","close","short","medium","far_optic1","far_optic2","AGM_Burst_far"};
+    modes[] += {"AGM_Burst_far"};
+
     class Single: Mode_SemiAuto {
       minRange = 120;        // 2;
     };
+
     class close;
     class medium;
     class AGM_Burst_far: medium {
@@ -518,9 +605,11 @@ class CfgWeapons {
       maxRangeProbab = 0.2;
       burst = "3 + round random 5";
     };
+
     class far_optic1: close {
       maxRange = 800;  //700;
     };
+
     class far_optic2: far_optic1 {
       maxRange = 1200; //1000;
     };

addons/ai/script_component.hpp

@@ -0,0 +1,12 @@
+#define COMPONENT ai
+#include "\z\ace\Addons\main\script_mod.hpp"
+
+#ifdef DEBUG_ENABLED_AI
+	#define DEBUG_MODE_FULL
+#endif
+
+#ifdef DEBUG_ENABLED_AI
+	#define DEBUG_SETTINGS DEBUG_ENABLED_AI
+#endif
+
+#include "\z\ace\Addons\main\script_macros.hpp"

addons/attach/CfgEventHandlers.hpp

@@ -1,5 +1,5 @@
-class Extended_PreInit_EventHandlers {
+class Extended_PreInit_EventHandlers {
-  class ADDON {
+  class ADDON {
-    init = QUOTE( call compile preprocessFileLineNumbers PATHTOF(XEH_preInit.sqf) );
+    init = QUOTE( call compile preprocessFileLineNumbers PATHTOF(XEH_preInit.sqf) );
-  };
+  };
 };

addons/attach/XEH_preInit.sqf

@@ -1,7 +1,7 @@
-#include "script_component.hpp"
+#include "script_component.hpp"
-
+
-PREPF(attach);
+PREPF(attach);
-PREPF(canAttach);
+PREPF(canAttach);
-PREPF(canDetach);
+PREPF(canDetach);
-PREPF(detach);
+PREPF(detach);
 PREPF(openAttachUI);

addons/attach/script_component.hpp

@@ -1,12 +1,12 @@
-#define COMPONENT attach
+#define COMPONENT attach
-#include "\z\ace\Addons\main\script_mod.hpp"
+#include "\z\ace\Addons\main\script_mod.hpp"
-
+
-#ifdef DEBUG_ENABLED_ATTACH
+#ifdef DEBUG_ENABLED_ATTACH
-	#define DEBUG_MODE_FULL
+	#define DEBUG_MODE_FULL
-#endif
+#endif
-
+
-#ifdef DEBUG_SETTINGS_ATTACH
+#ifdef DEBUG_SETTINGS_ATTACH
-	#define DEBUG_SETTINGS DEBUG_SETTINGS_ATTACH
+	#define DEBUG_SETTINGS DEBUG_SETTINGS_ATTACH
-#endif
+#endif
-
+
 #include "\z\ace\Addons\main\script_macros.hpp"

addons/interaction/$PBOPREFIX$

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

addons/laser/$PBOPREFIX$

@@ -1 +1 @@
-z\ace\Addons\laser
+z\ace\addons\laser

addons/main/script_macros.hpp

@@ -170,5 +170,37 @@
 #define ACE_TEXT_YELLOW(Text) ("<t color='#FFFF00'>" + ##Text + "</t>")
 
 
-#define PREPF(fncName) FUNC(fncName) = compile preprocessFileLineNumbers QUOTE(PATHTOF(functions\DOUBLES(fnc,fncName).sqf))
+
-#define PREP_MODULE(folder) [] call compile preprocessFileLineNumbers QUOTE(PATHTOF(folder\__PREP__.sqf))
+#define EGVAR(module,var) TRIPLES(PREFIX,module,var)
+#define QEGVAR(module,var) QUOTE(EGVAR(module,var))
+
+#define DGVAR(varName)	if(isNil "ACE_DEBUG_NAMESPACE") then { ACE_DEBUG_NAMESPACE = []; }; if(!(QUOTE(GVAR(varName)) in ACE_DEBUG_NAMESPACE)) then { PUSH(ACE_DEBUG_NAMESPACE, QUOTE(GVAR(varName))); }; GVAR(varName)
+#define DVAR(varName) 	if(isNil "ACE_DEBUG_NAMESPACE") then { ACE_DEBUG_NAMESPACE = []; }; if(!(QUOTE(varName) in ACE_DEBUG_NAMESPACE)) then { PUSH(ACE_DEBUG_NAMESPACE, QUOTE(varName)); }; varName
+#define DFUNC(var1) TRIPLES(ADDON,fnc,var1)
+
+#ifdef DISABLE_COMPILE_CACHE
+	#define PREP(fncName) DFUNC(fncName) = compile preprocessFileLineNumbers QUOTE(PATHTOF(functions\DOUBLES(fnc,fncName).sqf))
+#else
+	#define PREP(fncName) DFUNC(fncName) = QUOTE(PATHTOF(functions\DOUBLES(fnc,fncName).sqf)) call SLX_XEH_COMPILE
+#endif
+
+#define PREP_MODULE(folder) [] call compile preprocessFileLineNumbers QUOTE(PATHTOF(folder\__PREP__.sqf))
+
+
+#ifdef ENABLE_CALLSTACK
+#define CALLSTACK(function) {private ['_ret']; if(ACE_IS_ERRORED) then { ['AUTO','AUTO'] call ACE_DUMPSTACK_FNC; ACE_IS_ERRORED = false; }; ACE_IS_ERRORED = true; ACE_STACK_TRACE set [ACE_STACK_DEPTH, [diag_tickTime, __FILE__, __LINE__, ACE_CURRENT_FUNCTION, 'ANON', _this]]; ACE_STACK_DEPTH = ACE_STACK_DEPTH + 1; ACE_CURRENT_FUNCTION = 'ANON'; _ret = _this call ##function; ACE_STACK_DEPTH = ACE_STACK_DEPTH - 1; ACE_IS_ERRORED = false; _ret;}
+#define CALLSTACK_NAMED(function, functionName) {private ['_ret']; if(ACE_IS_ERRORED) then { ['AUTO','AUTO'] call ACE_DUMPSTACK_FNC; ACE_IS_ERRORED = false; }; ACE_IS_ERRORED = true; ACE_STACK_TRACE set [ACE_STACK_DEPTH, [diag_tickTime, __FILE__, __LINE__, ACE_CURRENT_FUNCTION, functionName, _this]]; ACE_STACK_DEPTH = ACE_STACK_DEPTH + 1; ACE_CURRENT_FUNCTION = functionName; _ret = _this call ##function; ACE_STACK_DEPTH = ACE_STACK_DEPTH - 1; ACE_IS_ERRORED = false; _ret;}
+#define DUMPSTACK ([__FILE__, __LINE__] call ACE_DUMPSTACK_FNC)
+
+#define FUNC(var1) {private ['_ret']; if(ACE_IS_ERRORED) then { ['AUTO','AUTO'] call ACE_DUMPSTACK_FNC; ACE_IS_ERRORED = false; }; ACE_IS_ERRORED = true; ACE_STACK_TRACE set [ACE_STACK_DEPTH, [diag_tickTime, __FILE__, __LINE__, ACE_CURRENT_FUNCTION, 'TRIPLES(ADDON,fnc,var1)', _this]]; ACE_STACK_DEPTH = ACE_STACK_DEPTH + 1; ACE_CURRENT_FUNCTION = 'TRIPLES(ADDON,fnc,var1)'; _ret = _this call TRIPLES(ADDON,fnc,var1); ACE_STACK_DEPTH = ACE_STACK_DEPTH - 1; ACE_IS_ERRORED = false; _ret;}
+#define EFUNC(var1,var2) {private ['_ret']; if(ACE_IS_ERRORED) then { ['AUTO','AUTO'] call ACE_DUMPSTACK_FNC; ACE_IS_ERRORED = false; }; ACE_IS_ERRORED = true; ACE_STACK_TRACE set [ACE_STACK_DEPTH, [diag_tickTime, __FILE__, __LINE__, ACE_CURRENT_FUNCTION, 'TRIPLES(DOUBLES(PREFIX,var1),fnc,var2)', _this]]; ACE_STACK_DEPTH = ACE_STACK_DEPTH + 1; ACE_CURRENT_FUNCTION = 'TRIPLES(DOUBLES(PREFIX,var1),fnc,var2)'; _ret = _this call TRIPLES(DOUBLES(PREFIX,var1),fnc,var2); ACE_STACK_DEPTH = ACE_STACK_DEPTH - 1; ACE_IS_ERRORED = false; _ret;}
+
+#else
+#define CALLSTACK(function) function
+#define CALLSTACK_NAMED(function, functionName) function
+#define DUMPSTACK
+
+#define FUNC(var1) TRIPLES(ADDON,fnc,var1)
+#define EFUNC(var1,var2) TRIPLES(DOUBLES(PREFIX,var1),fnc,var2)
+
+#endif

addons/missileguidance/$PBOPREFIX$

@@ -1 +1 @@
-z\ace\Addons\missileguidance
+z\ace\addons\missileguidance

addons/ragdolls/$PBOPREFIX$

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

addons/ragdolls/config.cpp

@@ -1,9 +1,11 @@
+#include "script_component.hpp"
+
 class CfgPatches {
-  class AGM_Ragdolls {
+  class ADDON {
     units[] = {};
     weapons[] = {};
     requiredVersion = 0.60;
-    requiredAddons[] = {AGM_Core};
+    requiredAddons[] = {ace_core};
     version = "0.95";
     versionStr = "0.95";
     versionAr[] = {0,95,0};

addons/ragdolls/script_component.hpp

@@ -0,0 +1,12 @@
+#define COMPONENT ragdolls
+#include "\z\ace\Addons\main\script_mod.hpp"
+
+#ifdef DEBUG_ENABLED_RAGDOLLS
+	#define DEBUG_MODE_FULL
+#endif
+
+#ifdef DEBUG_ENABLED_RAGDOLLS
+	#define DEBUG_SETTINGS DEBUG_ENABLED_RAGDOLLS
+#endif
+
+#include "\z\ace\Addons\main\script_macros.hpp"

addons/realisticnames/$PBOPREFIX$

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

addons/realisticnames/script_component.hpp

@@ -0,0 +1,12 @@
+#define COMPONENT realisticnames
+#include "\z\ace\Addons\main\script_mod.hpp"
+
+#ifdef DEBUG_ENABLED_REALISTICNAMES
+	#define DEBUG_MODE_FULL
+#endif
+
+#ifdef DEBUG_ENABLED_REALISTICNAMES
+	#define DEBUG_SETTINGS DEBUG_ENABLED_REALISTICNAMES
+#endif
+
+#include "\z\ace\Addons\main\script_macros.hpp"

addons/realisticnames/stringtable.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Edited with tabler - 2014-12-11 -->
-<Project name="AGM">
+<Project name="ACE">
   <Package name="RealisticNames">
-    <Key ID="STR_AGM_RealisticNames_HMG_01_Name">
+    <Key ID="STR_ACE_RealisticNames_HMG_01_Name">
       <English>XM312</English>
       <German>XM312</German>
       <Spanish>XM312</Spanish>
@@ -14,7 +14,7 @@
       <Hungarian>XM312</Hungarian>
       <Italian>XM312A</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_HMG_01_A_Name">
+    <Key ID="STR_ACE_RealisticNames_HMG_01_A_Name">
       <English>XM312A</English>
       <German>XM312A</German>
       <Spanish>XM312</Spanish>
@@ -26,7 +26,7 @@
       <Hungarian>XM312A</Hungarian>
       <Italian>XM312A</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_HMG_01_high_Name">
+    <Key ID="STR_ACE_RealisticNames_HMG_01_high_Name">
       <English>XM312 (High)</English>
       <German>XM312 (Hoch)</German>
       <Spanish>XM312 (Alto)</Spanish>
@@ -38,7 +38,7 @@
       <Hungarian>XM312 (Magasított)</Hungarian>
       <Italian>XM312 (Alta)</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_GMG_01_Name">
+    <Key ID="STR_ACE_RealisticNames_GMG_01_Name">
       <English>XM307</English>
       <German>XM307</German>
       <Spanish>XM307</Spanish>
@@ -50,7 +50,7 @@
       <Hungarian>XM307</Hungarian>
       <Italian>XM307</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_GMG_01_A_Name">
+    <Key ID="STR_ACE_RealisticNames_GMG_01_A_Name">
       <English>XM307A</English>
       <German>XM307A</German>
       <Spanish>XM307A</Spanish>
@@ -62,7 +62,7 @@
       <Hungarian>XM307A</Hungarian>
       <Italian>XM307A</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_GMG_01_high_Name">
+    <Key ID="STR_ACE_RealisticNames_GMG_01_high_Name">
       <English>XM307 (High)</English>
       <German>XM307 (Hoch)</German>
       <Spanish>XM307 (Alto)</Spanish>
@@ -74,7 +74,7 @@
       <Hungarian>XM307 (Magasított)</Hungarian>
       <Italian>XM307 (Alta)</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_static_AT_Name">
+    <Key ID="STR_ACE_RealisticNames_static_AT_Name">
       <English>Mini-Spike Launcher (AT)</English>
       <German>Mini-Spike Lenkflugkörper (AT)</German>
       <Spanish>Lanzador Mini-Spike (AT)</Spanish>
@@ -86,7 +86,7 @@
       <Hungarian>Mini-Spike rakétarendszer (páncéltörő)</Hungarian>
       <Italian>Lanciatore Mini-Spike (AC)</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_static_AA_Name">
+    <Key ID="STR_ACE_RealisticNames_static_AA_Name">
       <English>Mini-Spike Launcher (AA)</English>
       <German>Mini-Spike Lenkflugkörper (AA)</German>
       <Spanish>Lanzador Mini-Spike (AA)</Spanish>
@@ -98,7 +98,7 @@
       <Hungarian>Mini-Spike rakétarendszer (légvédelmi)</Hungarian>
       <Italian>Lanciatore Mini-Spike (AA)</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_UAV_02_Name">
+    <Key ID="STR_ACE_RealisticNames_UAV_02_Name">
       <English>YABHON-R3</English>
       <German>YABHON-R3</German>
       <Spanish>YABHON-R3</Spanish>
@@ -110,7 +110,7 @@
       <Hungarian>YABHON-R3</Hungarian>
       <Italian>YABHON-R3</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_UAV_02_CAS_Name">
+    <Key ID="STR_ACE_RealisticNames_UAV_02_CAS_Name">
       <English>YABHON-R3 (CAS)</English>
       <German>YABHON-R3 (Luftnahunterstützung)</German>
       <Spanish>YABHON-R3 (CAS)</Spanish>
@@ -118,7 +118,7 @@
       <Czech>YABHON-R3 (CAS)</Czech>
       <Russian>YABHON-R3 (штурмовик)</Russian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_MRAP_01_Name">
+    <Key ID="STR_ACE_RealisticNames_MRAP_01_Name">
       <English>M-ATV</English>
       <German>M-ATV</German>
       <Spanish>M-ATV</Spanish>
@@ -130,7 +130,7 @@
       <Hungarian>M-ATV</Hungarian>
       <Italian>M-ATV</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_MRAP_01_hmg_Name">
+    <Key ID="STR_ACE_RealisticNames_MRAP_01_hmg_Name">
       <English>M-ATV (HMG)</English>
       <German>M-ATV (SMG)</German>
       <Spanish>M-ATV (HMG)</Spanish>
@@ -142,7 +142,7 @@
       <Hungarian>M-ATV (HMG)</Hungarian>
       <Italian>M-ATV (HMG)</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_MRAP_01_gmg_Name">
+    <Key ID="STR_ACE_RealisticNames_MRAP_01_gmg_Name">
       <English>M-ATV (GMG)</English>
       <German>M-ATV (GMW)</German>
       <Spanish>M-ATV (GMG)</Spanish>
@@ -154,7 +154,7 @@
       <Hungarian>M-ATV (GMG)</Hungarian>
       <Italian>M-ATV (GMG)</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_MBT_01_cannon_Name">
+    <Key ID="STR_ACE_RealisticNames_MBT_01_cannon_Name">
       <English>Merkava Mk IV M</English>
       <German>Merkava Mk IV M</German>
       <Spanish>Merkava Mk IV M</Spanish>
@@ -166,7 +166,7 @@
       <Hungarian>Merkava Mk IV M</Hungarian>
       <Italian>Merkava Mk IV M</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_MBT_01_TUSK_Name">
+    <Key ID="STR_ACE_RealisticNames_MBT_01_TUSK_Name">
       <English>Merkava Mk IV LIC</English>
       <German>Merkava Mk IV LIC</German>
       <Spanish>Merkava Mk IV LIC</Spanish>
@@ -178,7 +178,7 @@
       <Hungarian>Merkava Mk IV LIC</Hungarian>
       <Italian>Merkava Mk IV LIC</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_MBT_01_arty_Name">
+    <Key ID="STR_ACE_RealisticNames_MBT_01_arty_Name">
       <English>Sholef</English>
       <German>Sholef</German>
       <Spanish>Sholef</Spanish>
@@ -190,7 +190,7 @@
       <Hungarian>Sholef</Hungarian>
       <Italian>Sholef</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_MBT_01_mlrs_Name">
+    <Key ID="STR_ACE_RealisticNames_MBT_01_mlrs_Name">
       <English>Seara</English>
       <German>Seara</German>
       <Spanish>Seara</Spanish>
@@ -202,7 +202,7 @@
       <Hungarian>Seara</Hungarian>
       <Italian>Seara</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_APC_Tracked_01_rcws_Name">
+    <Key ID="STR_ACE_RealisticNames_APC_Tracked_01_rcws_Name">
       <English>Namer</English>
       <German>Namer</German>
       <Spanish>Namer</Spanish>
@@ -214,7 +214,7 @@
       <Hungarian>Namer</Hungarian>
       <Italian>Namer</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_APC_Tracked_01_AA_Name">
+    <Key ID="STR_ACE_RealisticNames_APC_Tracked_01_AA_Name">
       <English>Bardelas</English>
       <German>Bardelas</German>
       <Spanish>Bardelas</Spanish>
@@ -226,7 +226,7 @@
       <Hungarian>Bardelas</Hungarian>
       <Italian>Bardelas</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_APC_Wheeled_cannon_Name">
+    <Key ID="STR_ACE_RealisticNames_APC_Wheeled_cannon_Name">
       <English>Patria AMV</English>
       <German>Patria AMV</German>
       <Spanish>Patria AMV</Spanish>
@@ -238,7 +238,7 @@
       <Hungarian>Patria AMV</Hungarian>
       <Italian>Patria AMV</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_APC_Tracked_01_CRV_Name">
+    <Key ID="STR_ACE_RealisticNames_APC_Tracked_01_CRV_Name">
       <English>Nemmera</English>
       <German>Nemmera</German>
       <Spanish>Nemmera</Spanish>
@@ -250,7 +250,7 @@
       <Hungarian>Nemmera</Hungarian>
       <Italian>Nemmera</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Truck_01_transport_Name">
+    <Key ID="STR_ACE_RealisticNames_Truck_01_transport_Name">
       <English>HEMTT Transport</English>
       <German>HEMTT Transport</German>
       <Spanish>HEMTT de transporte</Spanish>
@@ -262,7 +262,7 @@
       <Hungarian>HEMTT szállítójármű</Hungarian>
       <Italian>HEMTT da trasporto</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Truck_01_covered_Name">
+    <Key ID="STR_ACE_RealisticNames_Truck_01_covered_Name">
       <English>HEMTT Transport (covered)</English>
       <German>HEMTT Transport (bedeckt)</German>
       <Spanish>HEMTT de transporte (cubierto)</Spanish>
@@ -274,7 +274,7 @@
       <Hungarian>HEMTT szállítójármű (ponyvás)</Hungarian>
       <Italian>HEMTT da trasporto (coperto)</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Truck_01_mover_Name">
+    <Key ID="STR_ACE_RealisticNames_Truck_01_mover_Name">
       <English>HEMTT</English>
       <German>HEMTT</German>
       <Spanish>HEMTT</Spanish>
@@ -286,7 +286,7 @@
       <Hungarian>HEMTT</Hungarian>
       <Italian>HEMTT</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Truck_01_box_Name">
+    <Key ID="STR_ACE_RealisticNames_Truck_01_box_Name">
       <English>HEMTT Container</English>
       <German>HEMTT Container</German>
       <Spanish>HEMTT de contenedor</Spanish>
@@ -298,7 +298,7 @@
       <Hungarian>HEMTT Konténer</Hungarian>
       <Italian>HEMTT portacontainer </Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Truck_01_medical_Name">
+    <Key ID="STR_ACE_RealisticNames_Truck_01_medical_Name">
       <English>HEMTT Medical</English>
       <German>HEMTT Sanitäter</German>
       <Spanish>HEMTT médico</Spanish>
@@ -310,7 +310,7 @@
       <Hungarian>HEMTT (egészségügyi)</Hungarian>
       <Italian>HEMTT Medico</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Truck_01_ammo_Name">
+    <Key ID="STR_ACE_RealisticNames_Truck_01_ammo_Name">
       <English>HEMTT Ammo</English>
       <German>HEMTT Munition</German>
       <Spanish>HEMTT de munición</Spanish>
@@ -322,7 +322,7 @@
       <Hungarian>HEMTT (lőszerszállító)</Hungarian>
       <Italian>HEMTT di rifornimento munizioni</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Truck_01_fuel_Name">
+    <Key ID="STR_ACE_RealisticNames_Truck_01_fuel_Name">
       <English>HEMTT Fuel</English>
       <German>HEMTT Treibstoff</German>
       <Spanish>HEMTT de combustible</Spanish>
@@ -334,7 +334,7 @@
       <Hungarian>HEMTT (üzemanyag-szállító)</Hungarian>
       <Italian>HEMTT di rifornimento carburante</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Truck_01_Repair_Name">
+    <Key ID="STR_ACE_RealisticNames_Truck_01_Repair_Name">
       <English>HEMTT Repair</English>
       <German>HEMTT Instandsetzung</German>
       <Spanish>HEMTT de reparación</Spanish>
@@ -346,7 +346,7 @@
       <Hungarian>HEMTT (szerelő-jármű)</Hungarian>
       <Italian>HEMTT Riparatore</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_MRAP_03_Name">
+    <Key ID="STR_ACE_RealisticNames_MRAP_03_Name">
       <English>Fennek</English>
       <German>Fennek</German>
       <Spanish>Fennek</Spanish>
@@ -358,7 +358,7 @@
       <Hungarian>Fennek</Hungarian>
       <Italian>Fennek</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_MRAP_03_hmg_Name">
+    <Key ID="STR_ACE_RealisticNames_MRAP_03_hmg_Name">
       <English>Fennek (HMG)</English>
       <German>Fennek (SMG)</German>
       <Spanish>Fennek (HMG)</Spanish>
@@ -370,7 +370,7 @@
       <Hungarian>Fennek (HMG)</Hungarian>
       <Italian>Fennek (HMG)</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_MRAP_03_gmg_Name">
+    <Key ID="STR_ACE_RealisticNames_MRAP_03_gmg_Name">
       <English>Fennek (GMG)</English>
       <German>Fennek (GMW)</German>
       <Spanish>Fennek (GMG)</Spanish>
@@ -382,7 +382,7 @@
       <Hungarian>Fennek (GMG)</Hungarian>
       <Italian>Fennek (GMG)</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_MBT_03_cannon_Name">
+    <Key ID="STR_ACE_RealisticNames_MBT_03_cannon_Name">
       <English>Leopard 2SG</English>
       <German>Leopard 2SG</German>
       <Spanish>Leopard 2SG</Spanish>
@@ -394,7 +394,7 @@
       <Hungarian>Leopard 2SG</Hungarian>
       <Italian>Leopard 2SG</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_APC_tracked_03_cannon_Name">
+    <Key ID="STR_ACE_RealisticNames_APC_tracked_03_cannon_Name">
       <English>FV510 Warrior</English>
       <German>FV510 Warrior</German>
       <Spanish>FV510 Warrior</Spanish>
@@ -406,7 +406,7 @@
       <Hungarian>FV510 Warrior</Hungarian>
       <Italian>FV510 Warrior</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_APC_Wheeled_03_cannon_Name">
+    <Key ID="STR_ACE_RealisticNames_APC_Wheeled_03_cannon_Name">
       <English>Pandur II</English>
       <German>Pandur II</German>
       <Spanish>Pandur II</Spanish>
@@ -418,7 +418,7 @@
       <Hungarian>Pandur II</Hungarian>
       <Italian>Pandur II</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Truck_02_transport_Name">
+    <Key ID="STR_ACE_RealisticNames_Truck_02_transport_Name">
       <English>KamAZ Transport</English>
       <German>KamAZ Transport</German>
       <Spanish>KamAZ de transporte</Spanish>
@@ -430,7 +430,7 @@
       <Hungarian>KamAZ szállítójármű</Hungarian>
       <Italian>KamAZ da trasporto</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Truck_02_covered_Name">
+    <Key ID="STR_ACE_RealisticNames_Truck_02_covered_Name">
       <English>KamAZ Transport (covered)</English>
       <German>KamAZ Transport (bedeckt)</German>
       <Spanish>KamAZ de transporte (cubierto)</Spanish>
@@ -442,7 +442,7 @@
       <Hungarian>KamAZ szállítójármű (ponyvás)</Hungarian>
       <Italian>KamAZ da trasporto (coperto)</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Truck_02_ammo_Name">
+    <Key ID="STR_ACE_RealisticNames_Truck_02_ammo_Name">
       <English>KamAZ Ammo</English>
       <German>KamAZ Munition</German>
       <Spanish>KamAZ de munición</Spanish>
@@ -454,7 +454,7 @@
       <Hungarian>KamAZ (lőszerszállító)</Hungarian>
       <Italian>KamAZ  di rifornimento munizioni</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Truck_02_fuel_Name">
+    <Key ID="STR_ACE_RealisticNames_Truck_02_fuel_Name">
       <English>KamAZ Fuel</English>
       <German>KamAZ Treibstoff</German>
       <Spanish>KamAZ de combustible</Spanish>
@@ -466,7 +466,7 @@
       <Hungarian>KamAZ (üzemanyag-szállító)</Hungarian>
       <Italian>KamAZ  di rifornimento carburante</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Truck_02_box_Name">
+    <Key ID="STR_ACE_RealisticNames_Truck_02_box_Name">
       <English>KamAZ Repair</English>
       <German>KamAZ Instandsetzung</German>
       <Spanish>KamAZ de reparación</Spanish>
@@ -478,7 +478,7 @@
       <Hungarian>KamAZ (szerelő-jármű)</Hungarian>
       <Italian>KamAZ  riparatore</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Truck_02_medical_Name">
+    <Key ID="STR_ACE_RealisticNames_Truck_02_medical_Name">
       <English>KamAZ Medical</English>
       <German>KamAZ Sanitäter</German>
       <Spanish>KamAZ médico</Spanish>
@@ -490,7 +490,7 @@
       <Hungarian>KamAZ (egészségügyi)</Hungarian>
       <Italian>KamAZ Medico</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_MRAP_02_Name">
+    <Key ID="STR_ACE_RealisticNames_MRAP_02_Name">
       <English>Punisher</English>
       <German>Punisher</German>
       <Spanish>Punisher</Spanish>
@@ -502,7 +502,7 @@
       <Hungarian>Punisher</Hungarian>
       <Italian>Punisher</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_MRAP_02_hmg_Name">
+    <Key ID="STR_ACE_RealisticNames_MRAP_02_hmg_Name">
       <English>Punisher (HMG)</English>
       <German>Punisher (SMG)</German>
       <Spanish>Punisher (HMG)</Spanish>
@@ -514,7 +514,7 @@
       <Hungarian>Punisher (HMG)</Hungarian>
       <Italian>Punisher (HMG)</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_MRAP_02_gmg_Name">
+    <Key ID="STR_ACE_RealisticNames_MRAP_02_gmg_Name">
       <English>Punisher (GMG)</English>
       <German>Punisher (GMW)</German>
       <Spanish>Punisher (GMG)</Spanish>
@@ -526,7 +526,7 @@
       <Hungarian>Punisher (GMG)</Hungarian>
       <Italian>Punisher (GMG)</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_MBT_02_cannon_Name">
+    <Key ID="STR_ACE_RealisticNames_MBT_02_cannon_Name">
       <English>T100 Black Eagle</English>
       <German>T100 Black Eagle</German>
       <Spanish>T100 Black Eagle</Spanish>
@@ -538,7 +538,7 @@
       <Hungarian>T100 Black Eagle</Hungarian>
       <Italian>T100 Black Eagle</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_MBT_02_arty_Name">
+    <Key ID="STR_ACE_RealisticNames_MBT_02_arty_Name">
       <English>2S9 Sochor</English>
       <German>2S9 Sochor</German>
       <Spanish>2S9 Sochor</Spanish>
@@ -550,7 +550,7 @@
       <Hungarian>2S9 Sochor</Hungarian>
       <Italian>2S9 Sochor</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_APC_Tracked_02_cannon_Name">
+    <Key ID="STR_ACE_RealisticNames_APC_Tracked_02_cannon_Name">
       <English>BM-2T Stalker</English>
       <German>BM-2T Stalker</German>
       <Spanish>BM-2T Stalker</Spanish>
@@ -562,7 +562,7 @@
       <Hungarian>BM-2T Stalker</Hungarian>
       <Italian>BM-2T Stalker</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_APC_Tracked_02_AA_Name">
+    <Key ID="STR_ACE_RealisticNames_APC_Tracked_02_AA_Name">
       <English>ZSU-35 Tigris</English>
       <German>ZSU-35 Tigris</German>
       <Spanish>ZSU-35 Tigris</Spanish>
@@ -574,7 +574,7 @@
       <Hungarian>ZSU-35 Tigris</Hungarian>
       <Italian>ZSU-35 Tigris</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_APC_Wheeled_02_rcws_Name">
+    <Key ID="STR_ACE_RealisticNames_APC_Wheeled_02_rcws_Name">
       <English>Otokar ARMA</English>
       <German>Otokar ARMA</German>
       <Spanish>Otokar ARMA</Spanish>
@@ -586,7 +586,7 @@
       <Hungarian>Otokar ARMA</Hungarian>
       <Italian>Otokar ARMA</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Truck_03_transport_Name">
+    <Key ID="STR_ACE_RealisticNames_Truck_03_transport_Name">
       <English>Typhoon Transport</English>
       <German>Typhoon Transport</German>
       <Spanish>Typhoon de transporte</Spanish>
@@ -598,7 +598,7 @@
       <Hungarian>Typhoon szállítójármű</Hungarian>
       <Italian>Typhoon da trasporto</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Truck_03_covered_Name">
+    <Key ID="STR_ACE_RealisticNames_Truck_03_covered_Name">
       <English>Typhoon Transport (covered)</English>
       <German>Typhoon Transport (bedeckt)</German>
       <Spanish>Typhoon de transporte (cubierto)</Spanish>
@@ -610,7 +610,7 @@
       <Hungarian>Typhoon szállítójármű (ponyvás)</Hungarian>
       <Italian>Typhoon da trasporto (coperto)</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Truck_03_device_Name">
+    <Key ID="STR_ACE_RealisticNames_Truck_03_device_Name">
       <English>Typhoon Device</English>
       <German>Typhoon Gerät</German>
       <Spanish>Typhoon de dispositivo</Spanish>
@@ -622,7 +622,7 @@
       <Hungarian>Typhoon (szerkezet)</Hungarian>
       <Italian>Typhoon per dispositivo</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Truck_03_ammo_Name">
+    <Key ID="STR_ACE_RealisticNames_Truck_03_ammo_Name">
       <English>Typhoon Ammo</English>
       <German>Typhoon Munition</German>
       <Spanish>Typhoon de munición</Spanish>
@@ -634,7 +634,7 @@
       <Hungarian>Typhoon (lőszerszállító)</Hungarian>
       <Italian>Typhoon di rifornimento munizioni</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Truck_03_fuel_Name">
+    <Key ID="STR_ACE_RealisticNames_Truck_03_fuel_Name">
       <English>Typhoon Fuel</English>
       <German>Typhoon Treibstoff</German>
       <Spanish>Typhoon de combustible</Spanish>
@@ -646,7 +646,7 @@
       <Hungarian>Typhoon (üzemanyag-szállító)</Hungarian>
       <Italian>Typhoon di rifornimento carburante</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Truck_03_repair_Name">
+    <Key ID="STR_ACE_RealisticNames_Truck_03_repair_Name">
       <English>Typhoon Repair</English>
       <German>Typhoon Instandsetzung</German>
       <Spanish>Typhoon de reparación</Spanish>
@@ -658,7 +658,7 @@
       <Hungarian>Typhoon (szerelő-jármű)</Hungarian>
       <Italian>Typhoon riparatore</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Truck_03_medical_Name">
+    <Key ID="STR_ACE_RealisticNames_Truck_03_medical_Name">
       <English>Typhoon Medical</English>
       <German>Typhoon Sanitäter</German>
       <Spanish>Typhoon médico</Spanish>
@@ -670,7 +670,7 @@
       <Hungarian>Typhoon (egészségügyi)</Hungarian>
       <Italian>Typhoon medico</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Heli_Attack_01_Name">
+    <Key ID="STR_ACE_RealisticNames_Heli_Attack_01_Name">
       <English>RAH-66 Comanche</English>
       <German>RAH-66 Comanche</German>
       <Spanish>RAH-66 Comanche</Spanish>
@@ -682,7 +682,7 @@
       <Hungarian>RAH-66 Comanche</Hungarian>
       <Italian>RAH-66 Comanche</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Heli_Light_01_Name">
+    <Key ID="STR_ACE_RealisticNames_Heli_Light_01_Name">
       <English>MH-6 Little Bird</English>
       <German>MH-6 Little Bird</German>
       <Spanish>MH-6 Litte Bird</Spanish>
@@ -694,7 +694,7 @@
       <Hungarian>MH-6 Little Bird</Hungarian>
       <Italian>MH-6 Little Bird</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Heli_Light_01_armed_Name">
+    <Key ID="STR_ACE_RealisticNames_Heli_Light_01_armed_Name">
       <English>AH-6 Little Bird</English>
       <German>AH-6 Little Bird</German>
       <Spanish>AH-6 Little Bird</Spanish>
@@ -706,7 +706,7 @@
       <Hungarian>AH-6 Little Bird</Hungarian>
       <Italian>AH-6 Little Bird</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Heli_Transport_03_Name">
+    <Key ID="STR_ACE_RealisticNames_Heli_Transport_03_Name">
       <English>CH-47I Chinook</English>
       <German>CH-47I Chinook</German>
       <Spanish>CH-47I Chinook</Spanish>
@@ -718,7 +718,7 @@
       <Hungarian>CH-47I Chinook</Hungarian>
       <Italian>CH-47I Chinook</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Heli_Transport_03_unarmed_Name">
+    <Key ID="STR_ACE_RealisticNames_Heli_Transport_03_unarmed_Name">
       <English>CH-47I Chinook (unarmed)</English>
       <German>CH-47I Chinook (unbewaffnet)</German>
       <Spanish>CH-47I Chinnok (Desarmado)</Spanish>
@@ -726,7 +726,7 @@
       <Russian>CH-47I Chinook (невооруженный)</Russian>
       <Czech>CH-47I Chinook (Neozbrojený)</Czech>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Plane_CAS_01_Name">
+    <Key ID="STR_ACE_RealisticNames_Plane_CAS_01_Name">
       <English>A-10D Thunderbolt II</English>
       <German>A-10D Thunderbolt II</German>
       <Spanish>A-10D Thunderbolt II</Spanish>
@@ -738,7 +738,7 @@
       <Hungarian>A-10D Thunderbolt II</Hungarian>
       <Italian>A-10D Thunderbolt II</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Heli_light_03_Name">
+    <Key ID="STR_ACE_RealisticNames_Heli_light_03_Name">
       <English>AW159 Wildcat</English>
       <German>AW159 Wildcat</German>
       <Spanish>AW159 Wildcat</Spanish>
@@ -750,7 +750,7 @@
       <Hungarian>AW159 Wildcat</Hungarian>
       <Italian>AW159 Wildcat</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Heli_light_03_unarmed_Name">
+    <Key ID="STR_ACE_RealisticNames_Heli_light_03_unarmed_Name">
       <English>AW159 Wildcat (unarmed)</English>
       <German>AW159 Wildcat (unbewaffnet)</German>
       <Spanish>AW159 Wildcat (desarmado)</Spanish>
@@ -762,7 +762,7 @@
       <Hungarian>AW159 Wildcat (fegyvertelen)</Hungarian>
       <Italian>AW159 Wildcat (disarmato)</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Heli_Transport_02_Name">
+    <Key ID="STR_ACE_RealisticNames_Heli_Transport_02_Name">
       <English>AW101 Merlin</English>
       <German>AW101 Merlin</German>
       <Spanish>AW101 Merlin</Spanish>
@@ -774,7 +774,7 @@
       <Hungarian>AW101 Merlin</Hungarian>
       <Italian>AW101 Merlin</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Plane_Fighter_03_CAS_Name">
+    <Key ID="STR_ACE_RealisticNames_Plane_Fighter_03_CAS_Name">
       <English>L-159 ALCA (CAS)</English>
       <German>L-159 ALCA (CAS)</German>
       <Spanish>L-159 ALCA (CAS)</Spanish>
@@ -786,7 +786,7 @@
       <Hungarian>L-159 ALCA (CAS)</Hungarian>
       <Italian>L-159 ALCA (CAS)</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Plane_Fighter_03_AA_Name">
+    <Key ID="STR_ACE_RealisticNames_Plane_Fighter_03_AA_Name">
       <English>L-159 ALCA (AA)</English>
       <German>L-159 ALCA (AA)</German>
       <Spanish>L-159 ALCA (AA)</Spanish>
@@ -798,7 +798,7 @@
       <Hungarian>L-159 ALCA (AA)</Hungarian>
       <Italian>L-159 ALCA (AA)</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Heli_Light_02_Name">
+    <Key ID="STR_ACE_RealisticNames_Heli_Light_02_Name">
       <English>Ka-60 Kasatka</English>
       <German>Ka-60 Kasatka</German>
       <Spanish>Ka-60 Kasatka</Spanish>
@@ -810,7 +810,7 @@
       <Hungarian>Ka-60 Kasatka</Hungarian>
       <Italian>Ka-60 Kasatka</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Heli_Light_02_unarmed_Name">
+    <Key ID="STR_ACE_RealisticNames_Heli_Light_02_unarmed_Name">
       <English>Ka-60 Kasatka (unarmed)</English>
       <German>Ka-60 Kasatka (unbewaffnet)</German>
       <Spanish>Ka-60 Kasatka (desarmado)</Spanish>
@@ -822,7 +822,7 @@
       <Hungarian>Ka-60 Kasatka (fegyvertelen)</Hungarian>
       <Italian>Ka-60 Kasatka (disarmato)</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Plane_CAS_02_Name">
+    <Key ID="STR_ACE_RealisticNames_Plane_CAS_02_Name">
       <English>Yak-130</English>
       <German>Yak-130</German>
       <Spanish>Yak-130</Spanish>
@@ -834,7 +834,7 @@
       <Hungarian>Jak-130</Hungarian>
       <Italian>Yak-130</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Heli_Light_01_civil_Name">
+    <Key ID="STR_ACE_RealisticNames_Heli_Light_01_civil_Name">
       <English>MD 500</English>
       <German>MD 500</German>
       <Spanish>MD 500</Spanish>
@@ -846,7 +846,7 @@
       <Hungarian>MD 500</Hungarian>
       <Italian>MD 500</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_SLAM_Name">
+    <Key ID="STR_ACE_RealisticNames_SLAM_Name">
       <English>M4A1 SLAM</English>
       <German>M4A1 SLAM</German>
       <Spanish>M4A1 SLAM</Spanish>
@@ -858,7 +858,7 @@
       <Hungarian>M4A1 SLAM</Hungarian>
       <Italian>M4A1 SLAM</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_Claymore_Name">
+    <Key ID="STR_ACE_RealisticNames_Claymore_Name">
       <English>M18A1 Claymore</English>
       <German>M18A1 Claymore</German>
       <Spanish>M18A1 Claymore</Spanish>
@@ -870,7 +870,7 @@
       <Hungarian>M18A1 Claymore akna</Hungarian>
       <Italian>M18A1 Claymore Mina antiuomo</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_SatchelCharge_Name">
+    <Key ID="STR_ACE_RealisticNames_SatchelCharge_Name">
       <English>M183 Demolition Charge Assembly</English>
       <German>M183 Geballte Sprengladung</German>
       <Spanish>Conjunto de carga de demolición M183</Spanish>
@@ -882,7 +882,7 @@
       <Hungarian>M183 romboló töltet</Hungarian>
       <Italian>M183 Demolition Charge Assembly</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_DemoCharge_Name">
+    <Key ID="STR_ACE_RealisticNames_DemoCharge_Name">
       <English>M112 Demolition Block</English>
       <German>M112 Sprengladung</German>
       <Spanish>Bloque de demolición M112</Spanish>
@@ -894,7 +894,7 @@
       <Hungarian>M112 romboló töltet</Hungarian>
       <Italian>M112 Demolition Block</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_HandGrenade_Name">
+    <Key ID="STR_ACE_RealisticNames_HandGrenade_Name">
       <English>M67 Fragmentation Grenade</English>
       <German>M67 Splittergranate</German>
       <Spanish>Granada de fragmentación M67</Spanish>
@@ -906,7 +906,7 @@
       <Hungarian>M67 repeszgránát</Hungarian>
       <Italian>M67 Granata a frammentazione</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_SmokeShell_Name">
+    <Key ID="STR_ACE_RealisticNames_SmokeShell_Name">
       <English>M83 Smoke Grenade (White)</English>
       <German>M83 Rauchgranate (Weiss)</German>
       <Spanish>Granada de humo M83 (Blanco)</Spanish>
@@ -918,7 +918,7 @@
       <Hungarian>M83 füstgránát (Fehér)</Hungarian>
       <Italian>M83 Granata fumogena (Bianco)</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_SmokeShellBlue_Name">
+    <Key ID="STR_ACE_RealisticNames_SmokeShellBlue_Name">
       <English>M18 Smoke Grenade (Blue)</English>
       <German>M18 Rauchgranate (Blau)</German>
       <Spanish>Granada de humo M18 (Azul)</Spanish>
@@ -930,7 +930,7 @@
       <Hungarian>M18 füstgránát (Kék)</Hungarian>
       <Italian>M18 Granata fumogena (Blu)</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_SmokeShellGreen_Name">
+    <Key ID="STR_ACE_RealisticNames_SmokeShellGreen_Name">
       <English>M18 Smoke Grenade (Green)</English>
       <German>M18 Rauchgranate (Grün)</German>
       <Spanish>Granada de humo M18 (Verde)</Spanish>
@@ -942,7 +942,7 @@
       <Hungarian>M18 füstgránát (Zöld)</Hungarian>
       <Italian>M18 Granata fumogena (Verde)</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_SmokeShellOrange_Name">
+    <Key ID="STR_ACE_RealisticNames_SmokeShellOrange_Name">
       <English>M18 Smoke Grenade (Orange)</English>
       <German>M18 Rauchgranate (Orange)</German>
       <Spanish>Granada de humo M18 (Naranja)</Spanish>
@@ -954,7 +954,7 @@
       <Hungarian>M18 füstgránát (Narancssárga)</Hungarian>
       <Italian>M18 Granata fumogena (Arancione)</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_SmokeShellPurple_Name">
+    <Key ID="STR_ACE_RealisticNames_SmokeShellPurple_Name">
       <English>M18 Smoke Grenade (Purple)</English>
       <German>M18 Rauchgranate (Violett)</German>
       <Spanish>Granada de humo M18 (Púrpura)</Spanish>
@@ -966,7 +966,7 @@
       <Hungarian>M18 füstgránát (Lila)</Hungarian>
       <Italian>M18 Granata fumogena (Viola)</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_SmokeShellRed_Name">
+    <Key ID="STR_ACE_RealisticNames_SmokeShellRed_Name">
       <English>M18 Smoke Grenade (Red)</English>
       <German>M18 Rauchgranate (Rot)</German>
       <Spanish>Granada de humo M18 (Rojo)</Spanish>
@@ -978,7 +978,7 @@
       <Hungarian>M18 füstgránát (Piros)</Hungarian>
       <Italian>M18 Granata fumogena (Rosso)</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_SmokeShellYellow_Name">
+    <Key ID="STR_ACE_RealisticNames_SmokeShellYellow_Name">
       <English>M18 Smoke Grenade (Yellow)</English>
       <German>M18 Rauchgranate (Gelb)</German>
       <Spanish>Granada de humo M18 (Amarillo)</Spanish>
@@ -990,7 +990,7 @@
       <Hungarian>M18 füstgránát (Sárga)</Hungarian>
       <Italian>M18 Granata fumogena (Giallo)</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_ATMine_Name">
+    <Key ID="STR_ACE_RealisticNames_ATMine_Name">
       <English>M15 Anti-Tank Mine</English>
       <German>M15 Panzerabwehrmine</German>
       <Spanish>Mina antitanque M15</Spanish>
@@ -1002,7 +1002,7 @@
       <Hungarian>M15 harckocsiakna</Hungarian>
       <Italian>M15 Mine anticarro</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_APERSMine_Name">
+    <Key ID="STR_ACE_RealisticNames_APERSMine_Name">
       <English>VS-50 Anti-Personnel Mine</English>
       <German>VS-50 Antipersonenmine</German>
       <Spanish>Mina antipersona VS-50</Spanish>
@@ -1014,7 +1014,7 @@
       <Hungarian>VS-50 gyalogsági taposóakna</Hungarian>
       <Italian>VS-50 Mine antiuomo</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_APERSBoundingMine_Name">
+    <Key ID="STR_ACE_RealisticNames_APERSBoundingMine_Name">
       <English>M26 Anti-Personnel Bounding Mine</English>
       <German>M26 Antipersonensprungmine</German>
       <Spanish>Mina antipersona M26</Spanish>
@@ -1026,7 +1026,7 @@
       <Hungarian>M26 gyalogsági ugróakna</Hungarian>
       <Italian>M26 Mine saltanti antiuomo</Italian>
     </Key>
-    <Key ID="STR_AGM_RealisticNames_APERSTripwireMine_Name">
+    <Key ID="STR_ACE_RealisticNames_APERSTripwireMine_Name">
       <English>PMR-3 Anti-Personnel Tripwire Mine</English>
       <German>PMR-3 Antipersonenstolperdrahtmine</German>
       <Spanish>Mina antipersona de alambre PMR-3</Spanish>
@@ -1038,5 +1038,181 @@
       <Hungarian>PMR-3 botlódrótos gyalogsági akna</Hungarian>
       <Italian>PMR-3 Mine antiuomo</Italian>
     </Key>
+    <Key ID="STR_ACE_RealisticNames_hgun_P07_Name">
+      <English>P99</English>
+      <German>P99</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_hgun_Rook40_Name">
+      <English>MP-443 Grach</English>
+      <German>MP-443 Grach</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_hgun_ACPC2_Name">
+      <English>ACP-C2</English>
+      <German>ACP-C2</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_hgun_Pistol_heavy_01_Name">
+      <English>FNX-45 Tactical</English>
+      <German>FNX-45 Tactical</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_hgun_Pistol_heavy_02_Name">
+      <English>Chiappa Rhino 60DS</English>
+      <German>Chiappa Rhino 60DS</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_hgun_Pistol_Signal_Name">
+      <English>Taurus Judge</English>
+      <German>Taurus Judge</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_launch_NLAW_Name">
+      <English>NLAW</English>
+      <German>NLAW</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_launch_RPG32_Name">
+      <English>RPG-32</English>
+      <German>RPG-32</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_launch_Titan_Name">
+      <English>Mini-Spike (AA)</English>
+      <German>Mini-Spike (AA)</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_launch_Titan_short_Name">
+      <English>Mini-Spike (AT)</English>
+      <German>Mini-Spike (AT)</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_arifle_MX_Name">
+      <English>MX</English>
+      <German>MX</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_arifle_MX_Black_Name">
+      <English>MX (Black)</English>
+      <German>MX (Black)</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_arifle_MXC_Name">
+      <English>MXC</English>
+      <German>MXC</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_arifle_MXC_Black_Name">
+      <English>MXC (Black)</English>
+      <German>MXC (Black)</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_arifle_MX_GL_Name">
+      <English>MX 3GL</English>
+      <German>MX 3GL</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_arifle_MX_GL_Black_Name">
+      <English>MX 3GL (Black)</English>
+      <German>MX 3GL (Black)</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_arifle_MX_SW_Name">
+      <English>MX LSW</English>
+      <German>MX LSW</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_arifle_MX_SW_Black_Name">
+      <English>MX LSW (Black)</English>
+      <German>MX LSW (Black)</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_arifle_MXM_Name">
+      <English>MXM</English>
+      <German>MXM</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_arifle_MXM_Black_Name">
+      <English>MXM (Black)</English>
+      <German>MXM (Black)</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_arifle_Katiba_Name">
+      <English>KT2002 Katiba</English>
+      <German>KT2002 Katiba</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_arifle_Katiba_C_Name">
+      <English>KT2002C Katiba</English>
+      <German>KT2002C Katiba</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_arifle_Katiba_GL_Name">
+      <English>KT2002 Katiba KGL</English>
+      <German>KT2002 Katiba KGL</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_arifle_Mk20_Name">
+      <English>F2000 (Camo)</English>
+      <German>F2000 (Camo)</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_arifle_Mk20_plain_Name">
+      <English>F2000</English>
+      <German>F2000</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_arifle_Mk20C_Name">
+      <English>F2000 Tactical (Camo)</English>
+      <German>F2000 Tactical (Camo)</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_arifle_Mk20C_plain_Name">
+      <English>F2000 Tactical</English>
+      <German>F2000 Tactical</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_arifle_Mk20_GL_Name">
+      <English>F2000 EGLM (Camo)</English>
+      <German>F2000 EGLM (Camo)</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_arifle_Mk20_GL_plain_Name">
+      <English>F2000 EGLM</English>
+      <German>F2000 EGLM</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_arifle_TRG21_Name">
+      <English>TAR-21</English>
+      <German>TAR-21</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_arifle_TRG20_Name">
+      <English>CTAR-21</English>
+      <German>CTAR-21</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_arifle_TRG21_GL_Name">
+      <English>TAR-21 EGLM</English>
+      <German>TAR-21 EGLM</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_SMG_01_Name">
+      <English>Vector SMG</English>
+      <German>Vector SMG</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_SMG_02_Name">
+      <English>Scorpion Evo 3 A1</English>
+      <German>Scorpion Evo 3 A1</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_hgun_PDW2000_Name">
+      <English>CPW</English>
+      <German>CPW</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_arifle_SDAR_Name">
+      <English>RFB SDAR</English>
+      <German>RFB SDAR</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_LMG_Mk200_Name">
+      <English>Stoner 99 LMG</English>
+      <German>Stoner 99 LMG</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_LMG_Zafir_Name">
+      <English>Negev NG7</English>
+      <German>Negev NG7</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_srifle_EBR_Name">
+      <English>Mk14 Mod 1 EBR</English>
+      <German>Mk14 Mod 1 EBR</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_srifle_GM6_Name">
+      <English>GM6 Lynx</English>
+      <German>GM6 Lynx</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_srifle_GM6_camo_Name">
+      <English>GM6 Lynx (Camo)</English>
+      <German>GM6 Lynx (Camo)</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_srifle_LRR_Name">
+      <English>M200 Intervention</English>
+      <German>M200 Intervention</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_srifle_LRR_camo_Name">
+      <English>M200 Intervention (Camo)</English>
+      <German>M200 Intervention (Camo)</German>
+    </Key>
+    <Key ID="STR_ACE_RealisticNames_srifle_DMR_01_Name">
+      <English>VS-121</English>
+      <German>VS-121</German>
+    </Key>
   </Package>
 </Project>

addons/thermals/$PBOPREFIX$

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

addons/thermals/config.cpp

@@ -1,10 +1,11 @@
-// PATCH CONFIG
+#include "script_component.hpp"
+
 class CfgPatches {
-  class AGM_Thermals {
+  class ADDON {
     units[] = {};
     weapons[] = {};
     requiredVersion = 0.60;
-    requiredAddons[] = {AGM_Core};
+    requiredAddons[] = {ace_core};
     version = "0.95";
     versionStr = "0.95";
     versionAr[] = {0,95,0};

addons/thermals/script_component.hpp

@@ -0,0 +1,12 @@
+#define COMPONENT thermals
+#include "\z\ace\Addons\main\script_mod.hpp"
+
+#ifdef DEBUG_ENABLED_THERMALS
+	#define DEBUG_MODE_FULL
+#endif
+
+#ifdef DEBUG_ENABLED_THERMALS
+	#define DEBUG_SETTINGS DEBUG_ENABLED_THERMALS
+#endif
+
+#include "\z\ace\Addons\main\script_macros.hpp"

addons/wep_dragon/$PBOPREFIX$

@@ -1 +1 @@
-z\ace\Addons\wep_dragon
+z\ace\addons\wep_dragon

addons/wep_javelin/$PBOPREFIX$

@@ -1 +1 @@
-z\ace\Addons\wep_javelin
+z\ace\addons\wep_javelin

extras/blank_module/CfgEventHandlers.hpp

@@ -0,0 +1,5 @@
+class Extended_PreInit_EventHandlers {
+  class ADDON {
+    init = QUOTE( call compile preprocessFileLineNumbers PATHTOF(XEH_preInit.sqf) );
+  };
+};

extras/blank_module/XEH_preInit.sqf

@@ -0,0 +1,3 @@
+#include "script_component.hpp"
+
+PREP(empty);

extras/blank_module/config.cpp

@@ -0,0 +1,17 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+  class ADDON {
+    units[] = {};
+    weapons[] = {};
+    requiredVersion = 0.60;
+    requiredAddons[] = {"ace_core"};
+    version = "0.95";
+    versionStr = "0.95";
+    versionAr[] = {0,95,0};
+    author[] = {""};
+    authorUrl = "";
+  };
+};
+
+#include "CfgEventHandlers.hpp"

extras/blank_module/functions/fnc_empty.sqf

@@ -0,0 +1,3 @@
+#include "script_component.hpp"
+
+diag_log text format["This is here as an example!!!"];

extras/blank_module/script_component.hpp

@@ -0,0 +1,12 @@
+#define COMPONENT blank
+#include "\z\ace\addons\main\script_mod.hpp"
+
+#ifdef DEBUG_ENABLED_BLANK
+	#define DEBUG_MODE_FULL
+#endif
+
+#ifdef DEBUG_SETTINGS_BLANK
+	#define DEBUG_SETTINGS DEBUG_SETTINGS_BLANK
+#endif
+
+#include "\z\ace\addons\main\script_macros.hpp"

tools/build.bat

@@ -0,0 +1,4 @@
+pushd ..\addons\
+for /D %%i in (*.*) do (
+	makepbo -NUP -@=z\addons\ace\%%i %%i ace_%%i.pbo
+)