diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..a067f29817 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.pbo + diff --git a/AUTHORS.txt b/AUTHORS.txt new file mode 100644 index 0000000000..74d75babdd --- /dev/null +++ b/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 +Felix Wiegand +Garth "L-H" de Wet +Jo David +PabstMirror + +# CONTRIBUTORS +11RDP-LoupVert +[BIG]Bull +ACCtomeek +Adanteh +aeroson +Aggr094 +BlackQwar +Brakoviejo +Codingboy +Crusty +eRazeri +evromalarkey +Falke75 +Ferenczi +Ferenzi +Filip Basara (Logo) +geraldbolso1899 +Ghost +gienkov +gpgpgpgp +Grzegorz +Hamburger SV +havena +Hawkins +jokoho48 +Jonpas +Legolasindar +licht-im-Norden87 +MarcBook +Michail Nikolaev +nic547 +oscarmolinadev +pokertour +rakowozz +Raspu86 +Riccardo Petricca +Robert Boklahánics +simon84 +Tonic +Tourorist +Valentin Torikian diff --git a/addons/ai/$PBOPREFIX$ b/addons/ai/$PBOPREFIX$ new file mode 100644 index 0000000000..366bfa83de --- /dev/null +++ b/addons/ai/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\ai \ No newline at end of file diff --git a/TO_MERGE/agm/AI/config.cpp b/addons/ai/config.cpp similarity index 94% rename from TO_MERGE/agm/AI/config.cpp rename to addons/ai/config.cpp index bd2e7b922e..5e1264d418 100644 --- a/TO_MERGE/agm/AI/config.cpp +++ b/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; }; diff --git a/addons/ai/script_component.hpp b/addons/ai/script_component.hpp new file mode 100644 index 0000000000..46602db75c --- /dev/null +++ b/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" \ No newline at end of file diff --git a/addons/attach/CfgEventHandlers.hpp b/addons/attach/CfgEventHandlers.hpp index f4997ba248..8af0265fe2 100644 --- a/addons/attach/CfgEventHandlers.hpp +++ b/addons/attach/CfgEventHandlers.hpp @@ -1,5 +1,5 @@ -class Extended_PreInit_EventHandlers { - class ADDON { - init = QUOTE( call compile preprocessFileLineNumbers PATHTOF(XEH_preInit.sqf) ); - }; +class Extended_PreInit_EventHandlers { + class ADDON { + init = QUOTE( call compile preprocessFileLineNumbers PATHTOF(XEH_preInit.sqf) ); + }; }; \ No newline at end of file diff --git a/addons/Attach/UI/attach_ca.paa b/addons/attach/UI/attach_ca.paa similarity index 100% rename from addons/Attach/UI/attach_ca.paa rename to addons/attach/UI/attach_ca.paa diff --git a/addons/Attach/UI/detach_ca.paa b/addons/attach/UI/detach_ca.paa similarity index 100% rename from addons/Attach/UI/detach_ca.paa rename to addons/attach/UI/detach_ca.paa diff --git a/addons/Attach/UI/irstrobe_item.paa b/addons/attach/UI/irstrobe_item.paa similarity index 100% rename from addons/Attach/UI/irstrobe_item.paa rename to addons/attach/UI/irstrobe_item.paa diff --git a/addons/attach/XEH_preInit.sqf b/addons/attach/XEH_preInit.sqf index 7f953d62d9..311aa874ec 100644 --- a/addons/attach/XEH_preInit.sqf +++ b/addons/attach/XEH_preInit.sqf @@ -1,7 +1,7 @@ -#include "script_component.hpp" - -PREPF(attach); -PREPF(canAttach); -PREPF(canDetach); -PREPF(detach); +#include "script_component.hpp" + +PREPF(attach); +PREPF(canAttach); +PREPF(canDetach); +PREPF(detach); PREPF(openAttachUI); \ No newline at end of file diff --git a/addons/Attach/config.cpp b/addons/attach/config.cpp similarity index 100% rename from addons/Attach/config.cpp rename to addons/attach/config.cpp diff --git a/addons/Attach/functions/fn_attach.sqf b/addons/attach/functions/fnc_attach.sqf similarity index 100% rename from addons/Attach/functions/fn_attach.sqf rename to addons/attach/functions/fnc_attach.sqf diff --git a/addons/Attach/functions/fn_canAttach.sqf b/addons/attach/functions/fnc_canAttach.sqf similarity index 100% rename from addons/Attach/functions/fn_canAttach.sqf rename to addons/attach/functions/fnc_canAttach.sqf diff --git a/addons/Attach/functions/fn_canDetach.sqf b/addons/attach/functions/fnc_canDetach.sqf similarity index 100% rename from addons/Attach/functions/fn_canDetach.sqf rename to addons/attach/functions/fnc_canDetach.sqf diff --git a/addons/Attach/functions/fn_detach.sqf b/addons/attach/functions/fnc_detach.sqf similarity index 100% rename from addons/Attach/functions/fn_detach.sqf rename to addons/attach/functions/fnc_detach.sqf diff --git a/addons/Attach/functions/fn_openAttachUI.sqf b/addons/attach/functions/fnc_openAttachUI.sqf similarity index 100% rename from addons/Attach/functions/fn_openAttachUI.sqf rename to addons/attach/functions/fnc_openAttachUI.sqf diff --git a/addons/attach/script_component.hpp b/addons/attach/script_component.hpp index f4b58802e3..c09a5b97e1 100644 --- a/addons/attach/script_component.hpp +++ b/addons/attach/script_component.hpp @@ -1,12 +1,12 @@ -#define COMPONENT attach -#include "\z\ace\Addons\main\script_mod.hpp" - -#ifdef DEBUG_ENABLED_ATTACH - #define DEBUG_MODE_FULL -#endif - -#ifdef DEBUG_SETTINGS_ATTACH - #define DEBUG_SETTINGS DEBUG_SETTINGS_ATTACH -#endif - +#define COMPONENT attach +#include "\z\ace\Addons\main\script_mod.hpp" + +#ifdef DEBUG_ENABLED_ATTACH + #define DEBUG_MODE_FULL +#endif + +#ifdef DEBUG_SETTINGS_ATTACH + #define DEBUG_SETTINGS DEBUG_SETTINGS_ATTACH +#endif + #include "\z\ace\Addons\main\script_macros.hpp" \ No newline at end of file diff --git a/addons/Attach/stringtable.xml b/addons/attach/stringtable.xml similarity index 100% rename from addons/Attach/stringtable.xml rename to addons/attach/stringtable.xml diff --git a/addons/interaction/$PBOPREFIX$ b/addons/interaction/$PBOPREFIX$ new file mode 100644 index 0000000000..07f38b5a37 --- /dev/null +++ b/addons/interaction/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\interaction \ No newline at end of file diff --git a/addons/laser/$PBOPREFIX$ b/addons/laser/$PBOPREFIX$ index 1e4e48a4ca..43676b45dc 100644 --- a/addons/laser/$PBOPREFIX$ +++ b/addons/laser/$PBOPREFIX$ @@ -1 +1 @@ -z\ace\Addons\laser \ No newline at end of file +z\ace\addons\laser \ No newline at end of file diff --git a/addons/main/script_macros.hpp b/addons/main/script_macros.hpp index 8207dd12c3..3dd2b1ba92 100644 --- a/addons/main/script_macros.hpp +++ b/addons/main/script_macros.hpp @@ -170,5 +170,37 @@ #define ACE_TEXT_YELLOW(Text) ("" + ##Text + "") -#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)) \ No newline at end of file + +#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 diff --git a/addons/missileguidance/$PBOPREFIX$ b/addons/missileguidance/$PBOPREFIX$ index a2a17e3615..4e5e9ccc79 100644 --- a/addons/missileguidance/$PBOPREFIX$ +++ b/addons/missileguidance/$PBOPREFIX$ @@ -1 +1 @@ -z\ace\Addons\missileguidance \ No newline at end of file +z\ace\addons\missileguidance \ No newline at end of file diff --git a/addons/ragdolls/$PBOPREFIX$ b/addons/ragdolls/$PBOPREFIX$ new file mode 100644 index 0000000000..4c2fcd3ef9 --- /dev/null +++ b/addons/ragdolls/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\ragdolls \ No newline at end of file diff --git a/TO_MERGE/agm/Ragdolls/config.cpp b/addons/ragdolls/config.cpp similarity index 99% rename from TO_MERGE/agm/Ragdolls/config.cpp rename to addons/ragdolls/config.cpp index 8e71dfef61..dba3b10a7c 100644 --- a/TO_MERGE/agm/Ragdolls/config.cpp +++ b/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}; diff --git a/addons/ragdolls/script_component.hpp b/addons/ragdolls/script_component.hpp new file mode 100644 index 0000000000..f0306957b0 --- /dev/null +++ b/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" \ No newline at end of file diff --git a/addons/realisticnames/$PBOPREFIX$ b/addons/realisticnames/$PBOPREFIX$ new file mode 100644 index 0000000000..751ffff344 --- /dev/null +++ b/addons/realisticnames/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\realisticnames \ No newline at end of file diff --git a/TO_MERGE/agm/RealisticNames/config.cpp b/addons/realisticnames/config.cpp similarity index 53% rename from TO_MERGE/agm/RealisticNames/config.cpp rename to addons/realisticnames/config.cpp index 366cd139df..51afc36eb2 100644 --- a/TO_MERGE/agm/RealisticNames/config.cpp +++ b/addons/realisticnames/config.cpp @@ -1,924 +1,1062 @@ +#include "script_component.hpp" + class CfgPatches { - class AGM_RealisticNames { + class ADDON { units[] = {}; weapons[] = {}; requiredVersion = 0.60; - requiredAddons[] = {AGM_Core}; + requiredAddons[] = {ace_core}; version = "0.95"; versionStr = "0.95"; versionAr[] = {0,95,0}; - author[] = {"KoffeinFlummi", "TaoSensai"}; + author[] = {"KoffeinFlummi", "TaoSensai", "commy2"}; authorUrl = "https://github.com/KoffeinFlummi/"; }; }; // VEHICLES - class CfgVehicles { - // Global Inheritance + // static weapons class StaticMGWeapon; - class GMG_TriPod; - class AT_01_base_F; - class AA_01_base_F; - class UAV_02_base_F; - class UAV_02_CAS_base_F: UAV_02_base_F {}; - - // BLUFOR Inheritance - class MRAP_01_base_F; - class MRAP_01_gmg_base_F: MRAP_01_base_F {}; - class MRAP_01_hmg_base_F: MRAP_01_gmg_base_F {}; - class MBT_01_base_F; - class B_MBT_01_base_F: MBT_01_base_F {}; - class MBT_01_arty_base_F: MBT_01_base_F {}; - class B_MBT_01_arty_base_F: MBT_01_arty_base_F {}; - class MBT_01_mlrs_base_F: MBT_01_base_F {}; - class B_MBT_01_mlrs_base_F: MBT_01_mlrs_base_F {}; - class B_APC_Wheeled_01_base_F; - class B_APC_Tracked_01_base_F; - class Truck_01_base_F; - class Heli_Attack_01_base_F; - class Heli_Light_01_base_F; - class Heli_Light_01_armed_base_F; - class B_Heli_Transport_03_base_F; - class B_Heli_Transport_03_unarmed_base_F: B_Heli_Transport_03_base_F {}; - class Plane_CAS_01_base_F; - - // INDEP Inheritance - class MRAP_03_base_F; - class MRAP_03_hmg_base_F: MRAP_03_base_F {}; - class MRAP_03_gmg_base_F: MRAP_03_hmg_base_F {}; - class I_MBT_03_base_F; - class I_APC_Wheeled_03_base_F; - class I_APC_tracked_03_base_F; - class Truck_02_base_F; - class I_Heli_light_03_base_F; - class I_Heli_light_03_unarmed_base_F; - class Heli_Transport_02_base_F; - class Plane_Fighter_03_base_F; - - // OPFOR Inheritance - class MRAP_02_base_F; - class MRAP_02_hmg_base_F: MRAP_02_base_F {}; - class MRAP_02_gmg_base_F: MRAP_02_hmg_base_F {}; - class MBT_02_base_F; - class O_MBT_02_base_F: MBT_02_base_F {}; - class MBT_02_arty_base_F: MBT_02_base_F {}; - class O_MBT_02_arty_base_F: MBT_02_arty_base_F {}; - class O_APC_Wheeled_02_base_F; - class O_APC_Tracked_02_base_F; - class Truck_03_base_F; - class Heli_Light_02_base_F; - class Plane_CAS_02_base_F; - - //////////////////////////////////// - - // Global class HMG_01_base_F: StaticMGWeapon { - displayName = "$STR_AGM_RealisticNames_HMG_01_Name"; + displayName = "$STR_ACE_RealisticNames_HMG_01_Name"; }; class HMG_01_A_base_F: HMG_01_base_F { - displayName = "$STR_AGM_RealisticNames_HMG_01_A_Name"; + displayName = "$STR_ACE_RealisticNames_HMG_01_A_Name"; }; class HMG_01_high_base_F: HMG_01_base_F { - displayName = "$STR_AGM_RealisticNames_HMG_01_high_Name"; + displayName = "$STR_ACE_RealisticNames_HMG_01_high_Name"; }; + + class AT_01_base_F; + class B_static_AT_F: AT_01_base_F { + displayName = "$STR_ACE_RealisticNames_static_AT_Name"; + }; + class O_static_AT_F: AT_01_base_F { + displayName = "$STR_ACE_RealisticNames_static_AT_Name"; + }; + class I_static_AT_F: AT_01_base_F { + displayName = "$STR_ACE_RealisticNames_static_AT_Name"; + }; + + class AA_01_base_F; + class B_static_AA_F: AA_01_base_F { + displayName = "$STR_ACE_RealisticNames_static_AA_Name"; + }; + class O_static_AA_F: AA_01_base_F { + displayName = "$STR_ACE_RealisticNames_static_AA_Name"; + }; + class I_static_AA_F: AA_01_base_F { + displayName = "$STR_ACE_RealisticNames_static_AA_Name"; + }; + + class GMG_TriPod; class GMG_01_base_F: GMG_TriPod { - displayName = "$STR_AGM_RealisticNames_GMG_01_Name"; + displayName = "$STR_ACE_RealisticNames_GMG_01_Name"; }; class GMG_01_A_base_F: GMG_01_base_F { - displayName = "$STR_AGM_RealisticNames_GMG_01_A_Name"; + displayName = "$STR_ACE_RealisticNames_GMG_01_A_Name"; }; class GMG_01_high_base_F: GMG_01_base_F { - displayName = "$STR_AGM_RealisticNames_GMG_01_high_Name"; + displayName = "$STR_ACE_RealisticNames_GMG_01_high_Name"; }; - // BLUFOR + // M-ATV + class MRAP_01_base_F; class B_MRAP_01_F: MRAP_01_base_F { - displayName = "$STR_AGM_RealisticNames_MRAP_01_Name"; - }; - class B_MRAP_01_hmg_F: MRAP_01_hmg_base_F { - displayName = "$STR_AGM_RealisticNames_MRAP_01_hmg_Name"; + displayName = "$STR_ACE_RealisticNames_MRAP_01_Name"; }; + + class MRAP_01_gmg_base_F: MRAP_01_base_F {}; class B_MRAP_01_gmg_F: MRAP_01_gmg_base_F { - displayName = "$STR_AGM_RealisticNames_MRAP_01_gmg_Name"; + displayName = "$STR_ACE_RealisticNames_MRAP_01_gmg_Name"; }; + class MRAP_01_hmg_base_F: MRAP_01_gmg_base_F {}; + class B_MRAP_01_hmg_F: MRAP_01_hmg_base_F { + displayName = "$STR_ACE_RealisticNames_MRAP_01_hmg_Name"; + }; + + // punisher + class MRAP_02_base_F; + class O_MRAP_02_F: MRAP_02_base_F { + displayName = "$STR_ACE_RealisticNames_MRAP_02_Name"; + }; + + class MRAP_02_hmg_base_F: MRAP_02_base_F {}; + class O_MRAP_02_hmg_F: MRAP_02_hmg_base_F { + displayName = "$STR_ACE_RealisticNames_MRAP_02_hmg_Name"; + }; + + class MRAP_02_gmg_base_F: MRAP_02_hmg_base_F {}; + class O_MRAP_02_gmg_F: MRAP_02_gmg_base_F { + displayName = "$STR_ACE_RealisticNames_MRAP_02_gmg_Name"; + }; + + // strider + class MRAP_03_base_F; + class I_MRAP_03_F: MRAP_03_base_F { + displayName = "$STR_ACE_RealisticNames_MRAP_03_Name"; + }; + + class MRAP_03_hmg_base_F: MRAP_03_base_F {}; + class I_MRAP_03_hmg_F: MRAP_03_hmg_base_F { + displayName = "$STR_ACE_RealisticNames_MRAP_03_hmg_Name"; + }; + + class MRAP_03_gmg_base_F: MRAP_03_hmg_base_F {}; + class I_MRAP_03_gmg_F: MRAP_03_gmg_base_F { + displayName = "$STR_ACE_RealisticNames_MRAP_03_gmg_Name"; + }; + + // merkava derivates + class MBT_01_base_F; + class B_MBT_01_base_F: MBT_01_base_F {}; + class B_MBT_01_cannon_F: B_MBT_01_base_F { - displayName = "$STR_AGM_RealisticNames_MBT_01_cannon_Name"; + displayName = "$STR_ACE_RealisticNames_MBT_01_cannon_Name"; }; class B_MBT_01_TUSK_F: B_MBT_01_cannon_F { - displayName = "$STR_AGM_RealisticNames_MBT_01_TUSK_Name"; - }; - class B_MBT_01_arty_F: B_MBT_01_arty_base_F { - displayName = "$STR_AGM_RealisticNames_MBT_01_arty_Name"; - }; - class B_MBT_01_mlrs_F: B_MBT_01_mlrs_base_F { - displayName = "$STR_AGM_RealisticNames_MBT_01_mlrs_Name"; // Fictional name, (probably wrong) hebrew translation of storm. - }; - class B_APC_Tracked_01_rcws_F: B_APC_Tracked_01_base_F { - displayName = "$STR_AGM_RealisticNames_APC_Tracked_01_rcws_Name"; - }; - class B_APC_Tracked_01_AA_F: B_APC_Tracked_01_base_F { - displayName = "$STR_AGM_RealisticNames_APC_Tracked_01_AA_Name"; // Fictional name, (probably wrong) hebrew translation of cheetah. - }; - class B_APC_Wheeled_01_cannon_F: B_APC_Wheeled_01_base_F { - displayName = "$STR_AGM_RealisticNames_APC_Wheeled_cannon_Name"; - }; - class B_APC_Tracked_01_CRV_F: B_APC_Tracked_01_base_F { - displayName = "$STR_AGM_RealisticNames_APC_Tracked_01_CRV_Name"; + displayName = "$STR_ACE_RealisticNames_MBT_01_TUSK_Name"; }; + class MBT_01_arty_base_F: MBT_01_base_F {}; + class B_MBT_01_arty_base_F: MBT_01_arty_base_F {}; + + class B_MBT_01_arty_F: B_MBT_01_arty_base_F { + displayName = "$STR_ACE_RealisticNames_MBT_01_arty_Name"; + }; + + class MBT_01_mlrs_base_F: MBT_01_base_F {}; + class B_MBT_01_mlrs_base_F: MBT_01_mlrs_base_F {}; + + class B_MBT_01_mlrs_F: B_MBT_01_mlrs_base_F { + displayName = "$STR_ACE_RealisticNames_MBT_01_mlrs_Name"; // Fictional name, (probably wrong) hebrew translation of storm. + }; + + // T100 derivates + class MBT_02_base_F; + class O_MBT_02_base_F: MBT_02_base_F {}; + + class O_MBT_02_cannon_F: O_MBT_02_base_F { + displayName = "$STR_ACE_RealisticNames_MBT_02_cannon_Name"; + }; + + class MBT_02_arty_base_F: MBT_02_base_F {}; + class O_MBT_02_arty_base_F: MBT_02_arty_base_F {}; + + class O_MBT_02_arty_F: O_MBT_02_arty_base_F { + displayName = "$STR_ACE_RealisticNames_MBT_02_arty_Name"; + }; + + // leopard sg + class I_MBT_03_base_F; + class I_MBT_03_cannon_F: I_MBT_03_base_F { + displayName = "$STR_ACE_RealisticNames_MBT_03_cannon_Name"; + }; + + // tracked apcs + class B_APC_Tracked_01_base_F; + class B_APC_Tracked_01_rcws_F: B_APC_Tracked_01_base_F { + displayName = "$STR_ACE_RealisticNames_APC_Tracked_01_rcws_Name"; + }; + + class B_APC_Tracked_01_AA_F: B_APC_Tracked_01_base_F { + displayName = "$STR_ACE_RealisticNames_APC_Tracked_01_AA_Name"; // Fictional name, (probably wrong) hebrew translation of cheetah. + }; + + class B_APC_Tracked_01_CRV_F: B_APC_Tracked_01_base_F { + displayName = "$STR_ACE_RealisticNames_APC_Tracked_01_CRV_Name"; + }; + + class O_APC_Tracked_02_base_F; + class O_APC_Tracked_02_cannon_F: O_APC_Tracked_02_base_F { + displayName = "$STR_ACE_RealisticNames_APC_Tracked_02_cannon_Name"; + }; + + class O_APC_Tracked_02_AA_F: O_APC_Tracked_02_base_F { + displayName = "$STR_ACE_RealisticNames_APC_Tracked_02_AA_Name"; + }; + + class I_APC_tracked_03_base_F; + class I_APC_tracked_03_cannon_F: I_APC_tracked_03_base_F { + displayName = "$STR_ACE_RealisticNames_APC_tracked_03_cannon_Name"; + }; + + // wheeled apcs + class B_APC_Wheeled_01_base_F; + class B_APC_Wheeled_01_cannon_F: B_APC_Wheeled_01_base_F { + displayName = "$STR_ACE_RealisticNames_APC_Wheeled_cannon_Name"; + }; + + class O_APC_Wheeled_02_base_F; + class O_APC_Wheeled_02_rcws_F: O_APC_Wheeled_02_base_F { + displayName = "$STR_ACE_RealisticNames_APC_Wheeled_02_rcws_Name"; + }; + + class I_APC_Wheeled_03_base_F; + class I_APC_Wheeled_03_cannon_F: I_APC_Wheeled_03_base_F { + displayName = "$STR_ACE_RealisticNames_APC_Wheeled_03_cannon_Name"; + }; + + // trucks + class Truck_01_base_F; class B_Truck_01_transport_F: Truck_01_base_F { - displayName = "$STR_AGM_RealisticNames_Truck_01_transport_Name"; + displayName = "$STR_ACE_RealisticNames_Truck_01_transport_Name"; }; class B_Truck_01_covered_F: B_Truck_01_transport_F { - displayName = "$STR_AGM_RealisticNames_Truck_01_covered_Name"; + displayName = "$STR_ACE_RealisticNames_Truck_01_covered_Name"; }; class B_Truck_01_mover_F: B_Truck_01_transport_F { - displayName = "$STR_AGM_RealisticNames_Truck_01_mover_Name"; + displayName = "$STR_ACE_RealisticNames_Truck_01_mover_Name"; }; class B_Truck_01_box_F: B_Truck_01_mover_F { - displayName = "$STR_AGM_RealisticNames_Truck_01_box_Name"; + displayName = "$STR_ACE_RealisticNames_Truck_01_box_Name"; }; class B_Truck_01_medical_F: B_Truck_01_transport_F { - displayName = "$STR_AGM_RealisticNames_Truck_01_medical_Name"; + displayName = "$STR_ACE_RealisticNames_Truck_01_medical_Name"; }; class B_Truck_01_ammo_F: B_Truck_01_mover_F { - displayName = "$STR_AGM_RealisticNames_Truck_01_ammo_Name"; + displayName = "$STR_ACE_RealisticNames_Truck_01_ammo_Name"; }; class B_Truck_01_fuel_F: B_Truck_01_mover_F { - displayName = "$STR_AGM_RealisticNames_Truck_01_fuel_Name"; + displayName = "$STR_ACE_RealisticNames_Truck_01_fuel_Name"; }; class B_Truck_01_Repair_F: B_Truck_01_mover_F { - displayName = "$STR_AGM_RealisticNames_Truck_01_Repair_Name"; + displayName = "$STR_ACE_RealisticNames_Truck_01_Repair_Name"; }; - class B_Heli_Attack_01_F: Heli_Attack_01_base_F { - displayName = "$STR_AGM_RealisticNames_Heli_Attack_01_Name"; + class Truck_02_base_F; + class O_Truck_02_transport_F: Truck_02_base_F { + displayName = "$STR_ACE_RealisticNames_Truck_02_transport_Name"; }; - class B_Heli_Light_01_F: Heli_Light_01_base_F { - displayName = "$STR_AGM_RealisticNames_Heli_Light_01_Name"; + class O_Truck_02_covered_F: Truck_02_base_F { + displayName = "$STR_ACE_RealisticNames_Truck_02_covered_Name"; }; - class B_Heli_Light_01_armed_F: Heli_Light_01_armed_base_F { - displayName = "$STR_AGM_RealisticNames_Heli_Light_01_armed_Name"; + class O_Truck_02_ammo_F: Truck_02_base_F { + displayName = "$STR_ACE_RealisticNames_Truck_02_ammo_Name"; }; - class B_Heli_Transport_03_F: B_Heli_Transport_03_base_F { - displayName = "$STR_AGM_RealisticNames_Heli_Transport_03_Name"; + class O_Truck_02_fuel_F: Truck_02_base_F { + displayName = "$STR_ACE_RealisticNames_Truck_02_fuel_Name"; }; - class B_Heli_Transport_03_unarmed_F: B_Heli_Transport_03_unarmed_base_F { - displayName = "$STR_AGM_RealisticNames_Heli_Transport_03_unarmed_Name"; + class O_Truck_02_box_F: Truck_02_base_F { + displayName = "$STR_ACE_RealisticNames_Truck_02_box_Name"; }; - class B_Plane_CAS_01_F: Plane_CAS_01_base_F { - displayName = "$STR_AGM_RealisticNames_Plane_CAS_01_Name"; - }; - - class B_UAV_02_F: UAV_02_base_F { - displayName = "$STR_AGM_RealisticNames_UAV_02_Name"; - }; - class B_UAV_02_CAS_F: UAV_02_CAS_base_F { - displayName = "$STR_AGM_RealisticNames_UAV_02_CAS_Name"; - }; - - class B_static_AT_F: AT_01_base_F { - displayName = "$STR_AGM_RealisticNames_static_AT_Name"; - }; - class B_static_AA_F: AA_01_base_F { - displayName = "$STR_AGM_RealisticNames_static_AA_Name"; - }; - - - // INDEP - class I_MRAP_03_F: MRAP_03_base_F { - displayName = "$STR_AGM_RealisticNames_MRAP_03_Name"; - }; - class I_MRAP_03_hmg_F: MRAP_03_hmg_base_F { - displayName = "$STR_AGM_RealisticNames_MRAP_03_hmg_Name"; - }; - class I_MRAP_03_gmg_F: MRAP_03_gmg_base_F { - displayName = "$STR_AGM_RealisticNames_MRAP_03_gmg_Name"; - }; - - class I_MBT_03_cannon_F: I_MBT_03_base_F { - displayName = "$STR_AGM_RealisticNames_MBT_03_cannon_Name"; - }; - class I_APC_tracked_03_cannon_F: I_APC_tracked_03_base_F { - displayName = "$STR_AGM_RealisticNames_APC_tracked_03_cannon_Name"; - }; - class I_APC_Wheeled_03_cannon_F: I_APC_Wheeled_03_base_F { - displayName = "$STR_AGM_RealisticNames_APC_Wheeled_03_cannon_Name"; + class O_Truck_02_medical_F: O_Truck_02_box_F { + displayName = "$STR_ACE_RealisticNames_Truck_02_medical_Name"; }; class I_Truck_02_transport_F: Truck_02_base_F { - displayName = "$STR_AGM_RealisticNames_Truck_02_transport_Name"; + displayName = "$STR_ACE_RealisticNames_Truck_02_transport_Name"; }; class I_Truck_02_covered_F: Truck_02_base_F { - displayName = "$STR_AGM_RealisticNames_Truck_02_covered_Name"; + displayName = "$STR_ACE_RealisticNames_Truck_02_covered_Name"; }; class I_Truck_02_ammo_F: Truck_02_base_F { - displayName = "$STR_AGM_RealisticNames_Truck_02_ammo_Name"; + displayName = "$STR_ACE_RealisticNames_Truck_02_ammo_Name"; }; class I_Truck_02_fuel_F: Truck_02_base_F { - displayName = "$STR_AGM_RealisticNames_Truck_02_fuel_Name"; + displayName = "$STR_ACE_RealisticNames_Truck_02_fuel_Name"; }; class I_Truck_02_box_F: Truck_02_base_F { - displayName = "$STR_AGM_RealisticNames_Truck_02_box_Name"; + displayName = "$STR_ACE_RealisticNames_Truck_02_box_Name"; }; class I_Truck_02_medical_F: I_Truck_02_box_F { - displayName = "$STR_AGM_RealisticNames_Truck_02_medical_Name"; - }; - - class I_Heli_light_03_F: I_Heli_light_03_base_F { - displayName = "$STR_AGM_RealisticNames_Heli_light_03_Name"; - }; - class I_Heli_light_03_unarmed_F: I_Heli_light_03_unarmed_base_F { - displayName = "$STR_AGM_RealisticNames_Heli_light_03_unarmed_Name"; - }; - class I_Heli_Transport_02_F: Heli_Transport_02_base_F { - displayName = "$STR_AGM_RealisticNames_Heli_Transport_02_Name"; - }; - class I_Plane_Fighter_03_CAS_F: Plane_Fighter_03_base_F { - displayName = "$STR_AGM_RealisticNames_Plane_Fighter_03_CAS_Name"; - }; - class I_Plane_Fighter_03_AA_F: I_Plane_Fighter_03_CAS_F { - displayName = "$STR_AGM_RealisticNames_Plane_Fighter_03_AA_Name"; - }; - - class I_UAV_02_F: UAV_02_base_F { - displayName = "$STR_AGM_RealisticNames_UAV_02_Name"; - }; - class I_UAV_02_CAS_F: UAV_02_CAS_base_F { - displayName = "$STR_AGM_RealisticNames_UAV_02_CAS_Name"; - }; - - class I_static_AT_F: AT_01_base_F { - displayName = "$STR_AGM_RealisticNames_static_AT_Name"; - }; - class I_static_AA_F: AA_01_base_F { - displayName = "$STR_AGM_RealisticNames_static_AA_Name"; - }; - - - // OPFOR - class O_MRAP_02_F: MRAP_02_base_F { - displayName = "$STR_AGM_RealisticNames_MRAP_02_Name"; - }; - class O_MRAP_02_hmg_F: MRAP_02_hmg_base_F { - displayName = "$STR_AGM_RealisticNames_MRAP_02_hmg_Name"; - }; - class O_MRAP_02_gmg_F: MRAP_02_gmg_base_F { - displayName = "$STR_AGM_RealisticNames_MRAP_02_gmg_Name"; - }; - - class O_MBT_02_cannon_F: O_MBT_02_base_F { - displayName = "$STR_AGM_RealisticNames_MBT_02_cannon_Name"; - }; - class O_MBT_02_arty_F: O_MBT_02_arty_base_F { - displayName = "$STR_AGM_RealisticNames_MBT_02_arty_Name"; - }; - class O_APC_Tracked_02_cannon_F: O_APC_Tracked_02_base_F { - displayName = "$STR_AGM_RealisticNames_APC_Tracked_02_cannon_Name"; - }; - class O_APC_Tracked_02_AA_F: O_APC_Tracked_02_base_F { - displayName = "$STR_AGM_RealisticNames_APC_Tracked_02_AA_Name"; - }; - class O_APC_Wheeled_02_rcws_F: O_APC_Wheeled_02_base_F { - displayName = "$STR_AGM_RealisticNames_APC_Wheeled_02_rcws_Name"; - }; - - class O_Truck_02_transport_F: Truck_02_base_F { - displayName = "$STR_AGM_RealisticNames_Truck_02_transport_Name"; - }; - class O_Truck_02_covered_F: Truck_02_base_F { - displayName = "$STR_AGM_RealisticNames_Truck_02_covered_Name"; - }; - class O_Truck_02_ammo_F: Truck_02_base_F { - displayName = "$STR_AGM_RealisticNames_Truck_02_ammo_Name"; - }; - class O_Truck_02_fuel_F: Truck_02_base_F { - displayName = "$STR_AGM_RealisticNames_Truck_02_fuel_Name"; - }; - class O_Truck_02_box_F: Truck_02_base_F { - displayName = "$STR_AGM_RealisticNames_Truck_02_box_Name"; - }; - class O_Truck_02_medical_F: O_Truck_02_box_F { - displayName = "$STR_AGM_RealisticNames_Truck_02_medical_Name"; + displayName = "$STR_ACE_RealisticNames_Truck_02_medical_Name"; }; + class Truck_03_base_F; class O_Truck_03_transport_F: Truck_03_base_F { - displayName = "$STR_AGM_RealisticNames_Truck_03_transport_Name"; + displayName = "$STR_ACE_RealisticNames_Truck_03_transport_Name"; }; class O_Truck_03_covered_F: Truck_03_base_F { - displayName = "$STR_AGM_RealisticNames_Truck_03_covered_Name"; + displayName = "$STR_ACE_RealisticNames_Truck_03_covered_Name"; }; class O_Truck_03_device_F: Truck_03_base_F { - displayName = "$STR_AGM_RealisticNames_Truck_03_device_Name"; + displayName = "$STR_ACE_RealisticNames_Truck_03_device_Name"; }; class O_Truck_03_ammo_F: Truck_03_base_F { - displayName = "$STR_AGM_RealisticNames_Truck_03_ammo_Name"; + displayName = "$STR_ACE_RealisticNames_Truck_03_ammo_Name"; }; class O_Truck_03_fuel_F: Truck_03_base_F { - displayName = "$STR_AGM_RealisticNames_Truck_03_fuel_Name"; + displayName = "$STR_ACE_RealisticNames_Truck_03_fuel_Name"; }; class O_Truck_03_repair_F: Truck_03_base_F { - displayName = "$STR_AGM_RealisticNames_Truck_03_repair_Name"; + displayName = "$STR_ACE_RealisticNames_Truck_03_repair_Name"; }; class O_Truck_03_medical_F: Truck_03_base_F { - displayName = "$STR_AGM_RealisticNames_Truck_03_medical_Name"; + displayName = "$STR_ACE_RealisticNames_Truck_03_medical_Name"; }; + // helicopters + class Heli_Attack_01_base_F; + class B_Heli_Attack_01_F: Heli_Attack_01_base_F { + displayName = "$STR_ACE_RealisticNames_Heli_Attack_01_Name"; + }; + + class Heli_Light_01_base_F; + class B_Heli_Light_01_F: Heli_Light_01_base_F { + displayName = "$STR_ACE_RealisticNames_Heli_Light_01_Name"; + }; + + class Heli_Light_01_armed_base_F; + class B_Heli_Light_01_armed_F: Heli_Light_01_armed_base_F { + displayName = "$STR_ACE_RealisticNames_Heli_Light_01_armed_Name"; + }; + + class Heli_Light_01_civil_base_F: Heli_Light_01_base_F { + displayName = "$STR_ACE_RealisticNames_Heli_Light_01_civil_Name"; + }; + + class B_Heli_Transport_03_base_F; + class B_Heli_Transport_03_F: B_Heli_Transport_03_base_F { + displayName = "$STR_ACE_RealisticNames_Heli_Transport_03_Name"; + }; + + class B_Heli_Transport_03_unarmed_base_F: B_Heli_Transport_03_base_F {}; + class B_Heli_Transport_03_unarmed_F: B_Heli_Transport_03_unarmed_base_F { + displayName = "$STR_ACE_RealisticNames_Heli_Transport_03_unarmed_Name"; + }; + + class Heli_Light_02_base_F; class O_Heli_Light_02_F: Heli_Light_02_base_F { - displayName = "$STR_AGM_RealisticNames_Heli_Light_02_Name"; + displayName = "$STR_ACE_RealisticNames_Heli_Light_02_Name"; }; class O_Heli_Light_02_unarmed_F: Heli_Light_02_base_F { - displayName = "$STR_AGM_RealisticNames_Heli_Light_02_unarmed_Name"; - }; - class O_Plane_CAS_02_F: Plane_CAS_02_base_F { - displayName = "$STR_AGM_RealisticNames_Plane_CAS_02_Name"; + displayName = "$STR_ACE_RealisticNames_Heli_Light_02_unarmed_Name"; }; + class I_Heli_light_03_base_F; + class I_Heli_light_03_F: I_Heli_light_03_base_F { + displayName = "$STR_ACE_RealisticNames_Heli_light_03_Name"; + }; + + class I_Heli_light_03_unarmed_base_F; + class I_Heli_light_03_unarmed_F: I_Heli_light_03_unarmed_base_F { + displayName = "$STR_ACE_RealisticNames_Heli_light_03_unarmed_Name"; + }; + + class Heli_Transport_02_base_F; + class I_Heli_Transport_02_F: Heli_Transport_02_base_F { + displayName = "$STR_ACE_RealisticNames_Heli_Transport_02_Name"; + }; + + // planes + class Plane_CAS_01_base_F; + class B_Plane_CAS_01_F: Plane_CAS_01_base_F { + displayName = "$STR_ACE_RealisticNames_Plane_CAS_01_Name"; + }; + + class Plane_CAS_02_base_F; + class O_Plane_CAS_02_F: Plane_CAS_02_base_F { + displayName = "$STR_ACE_RealisticNames_Plane_CAS_02_Name"; + }; + + class Plane_Fighter_03_base_F; + class I_Plane_Fighter_03_CAS_F: Plane_Fighter_03_base_F { + displayName = "$STR_ACE_RealisticNames_Plane_Fighter_03_CAS_Name"; + }; + + class I_Plane_Fighter_03_AA_F: I_Plane_Fighter_03_CAS_F { + displayName = "$STR_ACE_RealisticNames_Plane_Fighter_03_AA_Name"; + }; + + // uavs + class UAV_02_base_F; + class B_UAV_02_F: UAV_02_base_F { + displayName = "$STR_ACE_RealisticNames_UAV_02_Name"; + }; class O_UAV_02_F: UAV_02_base_F { - displayName = "$STR_AGM_RealisticNames_UAV_02_Name"; + displayName = "$STR_ACE_RealisticNames_UAV_02_Name"; + }; + class I_UAV_02_F: UAV_02_base_F { + displayName = "$STR_ACE_RealisticNames_UAV_02_Name"; + }; + + class UAV_02_CAS_base_F: UAV_02_base_F {}; + class B_UAV_02_CAS_F: UAV_02_CAS_base_F { + displayName = "$STR_ACE_RealisticNames_UAV_02_CAS_Name"; }; class O_UAV_02_CAS_F: UAV_02_CAS_base_F { - displayName = "$STR_AGM_RealisticNames_UAV_02_CAS_Name"; + displayName = "$STR_ACE_RealisticNames_UAV_02_CAS_Name"; }; - - class O_static_AT_F: AT_01_base_F { - displayName = "$STR_AGM_RealisticNames_static_AT_Name"; - }; - class O_static_AA_F: AA_01_base_F { - displayName = "$STR_AGM_RealisticNames_static_AA_Name"; - }; - - // Civilian - class Heli_Light_01_civil_base_F: Heli_Light_01_base_F { - displayName = "$STR_AGM_RealisticNames_Heli_Light_01_civil_Name"; + class I_UAV_02_CAS_F: UAV_02_CAS_base_F { + displayName = "$STR_ACE_RealisticNames_UAV_02_CAS_Name"; }; // pistols class Pistol_Base_F; class Weapon_hgun_P07_F: Pistol_Base_F { - displayName = "P99"; + displayName = "$STR_ACE_RealisticNames_hgun_P07_Name"; }; + class Weapon_hgun_Rook40_F: Pistol_Base_F { - displayName = "MP-443 Grach"; + displayName = "$STR_ACE_RealisticNames_hgun_Rook40_Name"; }; + class Weapon_hgun_ACPC2_F: Pistol_Base_F { - displayName = "ACP-C2"; + displayName = "$STR_ACE_RealisticNames_hgun_ACPC2_Name"; }; + class Weapon_hgun_Pistol_heavy_01_F: Pistol_Base_F { - displayName = "FNX-45 Tactical"; + displayName = "$STR_ACE_RealisticNames_hgun_Pistol_heavy_01_Name"; }; + class Weapon_hgun_Pistol_heavy_02_F: Pistol_Base_F { - displayName = "Chiappa Rhino 60DS"; + displayName = "$STR_ACE_RealisticNames_hgun_Pistol_heavy_02_Name"; }; + class Weapon_hgun_Pistol_Signal_F: Pistol_Base_F { - displayName = "Taurus Judge"; + displayName = "$STR_ACE_RealisticNames_hgun_Pistol_Signal_Name"; }; // rocket launchers class Launcher_Base_F; class Weapon_launch_NLAW_F: Launcher_Base_F { - displayName = "NLAW"; + displayName = "$STR_ACE_RealisticNames_launch_NLAW_Name"; }; + class Weapon_launch_RPG32_F: Launcher_Base_F { - displayName = "RPG-32"; + displayName = "$STR_ACE_RealisticNames_launch_RPG32_Name"; }; + class Weapon_launch_Titan_F: Launcher_Base_F { - displayName = "Mini-Spike (AA)"; + displayName = "$STR_ACE_RealisticNames_launch_Titan_Name"; }; + class Weapon_launch_Titan_short_F: Launcher_Base_F { - displayName = "Mini-Spike (AT)"; + displayName = "$STR_ACE_RealisticNames_launch_Titan_short_Name"; }; + class Weapon_launch_B_Titan_F: Launcher_Base_F { - displayName = "Mini-Spike (AA)"; + displayName = "$STR_ACE_RealisticNames_launch_Titan_Name"; }; //class Weapon_launch_I_Titan_F: Weapon_launch_B_Titan_F {}; //class Weapon_launch_O_Titan_F: Weapon_launch_B_Titan_F {}; + class Weapon_launch_launch_B_Titan_short_F: Launcher_Base_F { - displayName = "Mini-Spike (AT)"; + displayName = "$STR_ACE_RealisticNames_launch_Titan_short_Name"; }; //class Weapon_launch_I_Titan_short_F: Weapon_launch_launch_B_Titan_short_F {}; //class Weapon_launch_O_Titan_short_F: Weapon_launch_launch_B_Titan_short_F {}; // rifles + + // MX class Weapon_Base_F; class Weapon_arifle_MX_F: Weapon_Base_F { - displayName = "MX"; + displayName = "$STR_ACE_RealisticNames_arifle_MX_Name"; }; + class Weapon_arifle_MXC_F: Weapon_Base_F { - displayName = "MXC"; + displayName = "$STR_ACE_RealisticNames_arifle_MXC_Name"; }; + class Weapon_arifle_MX_GL_F: Weapon_Base_F { - displayName = "MX 3GL"; + displayName = "$STR_ACE_RealisticNames_arifle_MX_GL_Name"; }; + class Weapon_arifle_MX_SW_F: Weapon_Base_F { - displayName = "MX LSW"; + displayName = "$STR_ACE_RealisticNames_arifle_MX_SW_Name"; }; + class Weapon_arifle_MXM_F: Weapon_Base_F { - displayName = "MXM"; + displayName = "$STR_ACE_RealisticNames_arifle_MXM_Name"; }; + // Katiba class Weapon_arifle_Katiba_F: Weapon_Base_F { - displayName = "KT2002 Katiba"; + displayName = "$STR_ACE_RealisticNames_arifle_Katiba_Name"; }; + class Weapon_arifle_Katiba_C_F: Weapon_Base_F { - displayName = "KT2002C Katiba"; + displayName = "$STR_ACE_RealisticNames_arifle_Katiba_C_Name"; }; + class Weapon_arifle_Katiba_GL_F: Weapon_Base_F { - displayName = "KT2002 Katiba KGL"; + displayName = "$STR_ACE_RealisticNames_arifle_Katiba_GL_Name"; }; + // F2000 class Weapon_arifle_Mk20_F: Weapon_Base_F { - displayName = "F2000 (Camo)"; - }; - class Weapon_arifle_Mk20_plain_F: Weapon_Base_F { - displayName = "F2000"; - }; - class Weapon_arifle_Mk20C_F: Weapon_Base_F { - displayName = "F2000 Tactical (Camo)"; - }; - class Weapon_arifle_Mk20C_plain_F: Weapon_Base_F { - displayName = "F2000 Tactical"; - }; - class Weapon_arifle_Mk20_GL_F: Weapon_Base_F { - displayName = "F2000 EGLM (Camo)"; - }; - class Weapon_arifle_Mk20_GL_plain_F: Weapon_Base_F { - displayName = "F2000 EGLM"; + displayName = "$STR_ACE_RealisticNames_arifle_Mk20_Name"; }; + class Weapon_arifle_Mk20_plain_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_Mk20_plain_Name"; + }; + + class Weapon_arifle_Mk20C_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_Mk20C_Name"; + }; + + class Weapon_arifle_Mk20C_plain_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_Mk20C_plain_Name"; + }; + + class Weapon_arifle_Mk20_GL_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_Mk20_GL_Name"; + }; + + class Weapon_arifle_Mk20_GL_plain_F: Weapon_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_Mk20_GL_plain_Name"; + }; + + // TAR-21 class Weapon_arifle_TRG21_F: Weapon_Base_F { - displayName = "TAR-21"; + displayName = "$STR_ACE_RealisticNames_arifle_TRG21_Name"; }; + class Weapon_arifle_TRG20_F: Weapon_Base_F { - displayName = "CTAR-21"; + displayName = "$STR_ACE_RealisticNames_arifle_TRG20_Name"; }; + class Weapon_arifle_TRG21_GL_F: Weapon_Base_F { - displayName = "TAR-21 EGLM"; + displayName = "$STR_ACE_RealisticNames_arifle_TRG21_GL_Name"; }; // sub machine guns class Weapon_SMG_01_F: Weapon_Base_F { - displayName = "Vector SMG"; + displayName = "$STR_ACE_RealisticNames_SMG_01_Name"; }; + class Weapon_SMG_02_F: Weapon_Base_F { - displayName = "Scorpion Evo 3 A1"; + displayName = "$STR_ACE_RealisticNames_SMG_02_Name"; }; + class Weapon_hgun_PDW2000_F: Weapon_Base_F { - displayName = "CPW"; + displayName = "$STR_ACE_RealisticNames_hgun_PDW2000_Name"; }; + class Weapon_arifle_SDAR_F: Weapon_Base_F { - displayName = "RFB SDAR"; + displayName = "$STR_ACE_RealisticNames_arifle_SDAR_Name"; }; // machine guns class Weapon_LMG_Mk200_F: Weapon_Base_F { - displayName = "Stoner 99 LMG"; + displayName = "$STR_ACE_RealisticNames_LMG_Mk200_Name"; }; + class Weapon_LMG_Zafir_F: Weapon_Base_F { - displayName = "Negev NG7"; + displayName = "$STR_ACE_RealisticNames_LMG_Zafir_Name"; }; // sniper rifles class Weapon_srifle_EBR_F: Weapon_Base_F { - displayName = "Mk14 Mod 1 EBR"; + displayName = "$STR_ACE_RealisticNames_srifle_EBR_Name"; }; + class Weapon_srifle_GM6_F: Weapon_Base_F { - displayName = "GM6 Lynx"; + displayName = "$STR_ACE_RealisticNames_srifle_GM6_Name"; }; + class Weapon_srifle_GM6_camo_F: Weapon_Base_F { - displayName = "GM6 Lynx (Camo)"; + displayName = "$STR_ACE_RealisticNames_srifle_GM6_camo_Name"; }; + class Weapon_srifle_LRR_F: Weapon_Base_F { - displayName = "M200 Intervention"; + displayName = "$STR_ACE_RealisticNames_srifle_LRR_Name"; }; + class Weapon_srifle_LRR_camo_F: Weapon_Base_F { - displayName = "M200 Intervention (Camo)"; + displayName = "$STR_ACE_RealisticNames_srifle_LRR_camo_Name"; }; + class Weapon_srifle_DMR_01_F: Weapon_Base_F { - displayName = "VS-121"; + displayName = "$STR_ACE_RealisticNames_srifle_DMR_01_Name"; }; }; // WEAPONS - class Mode_FullAuto; + class CfgWeapons { - class Rifle_Base_F; + // assault rifles + + // MX + class arifle_MX_Base_F; + class arifle_MX_F: arifle_MX_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_MX_Name"; + }; + class arifle_MX_Black_F: arifle_MX_F { + displayName = "$STR_ACE_RealisticNames_arifle_MX_Black_Name"; + }; + + class arifle_MXC_F: arifle_MX_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_MXC_Name"; + }; + class arifle_MXC_Black_F: arifle_MXC_F { + displayName = "$STR_ACE_RealisticNames_arifle_MXC_Black_Name"; + }; + + class arifle_MX_GL_F: arifle_MX_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_MX_GL_Name"; + }; + class arifle_MX_GL_Black_F: arifle_MX_GL_F { + displayName = "$STR_ACE_RealisticNames_arifle_MX_GL_Black_Name"; + }; + + class arifle_MX_SW_F: arifle_MX_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_MX_SW_Name"; + }; + class arifle_MX_SW_Black_F: arifle_MX_SW_F { + displayName = "$STR_ACE_RealisticNames_arifle_MX_SW_Black_Name"; + }; + + class arifle_MXM_F: arifle_MX_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_MXM_Name"; + }; + class arifle_MXM_Black_F: arifle_MXM_F { + displayName = "$STR_ACE_RealisticNames_arifle_MXM_Black_Name"; + }; + + // Katiba + class arifle_katiba_Base_F; + class arifle_Katiba_F: arifle_katiba_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_Katiba_Name"; + }; + class arifle_Katiba_GL_F: arifle_katiba_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_Katiba_GL_Name"; + }; + class arifle_Katiba_C_F: arifle_katiba_Base_F { + displayName = "$STR_ACE_RealisticNames_arifle_Katiba_C_Name"; + }; + + // SDAR + class SDAR_base_F; + class arifle_SDAR_F: SDAR_base_F { + displayName = "$STR_ACE_RealisticNames_arifle_SDAR_Name"; + }; + + // TAR-21 + class Tavor_base_F; + class arifle_TRG21_F: Tavor_base_F { + displayName = "$STR_ACE_RealisticNames_arifle_TRG21_Name"; + }; + class arifle_TRG21_GL_F: arifle_TRG21_F { + displayName = "$STR_ACE_RealisticNames_arifle_TRG21_GL_Name"; + }; + class arifle_TRG20_F: Tavor_base_F { + displayName = "$STR_ACE_RealisticNames_arifle_TRG20_Name"; + }; + + // F2000 + class mk20_base_F; + class arifle_Mk20_F: mk20_base_F { + displayName = "$STR_ACE_RealisticNames_arifle_Mk20_Name"; + }; + class arifle_Mk20_plain_F: arifle_Mk20_F { + displayName = "$STR_ACE_RealisticNames_arifle_Mk20_plain_Name"; + }; + + class arifle_Mk20C_F: mk20_base_F { + displayName = "$STR_ACE_RealisticNames_arifle_Mk20C_Name"; + }; + class arifle_Mk20C_plain_F: arifle_Mk20C_F { + displayName = "$STR_ACE_RealisticNames_arifle_Mk20C_plain_Name"; + }; + + class arifle_Mk20_GL_F: mk20_base_F { + displayName = "$STR_ACE_RealisticNames_arifle_Mk20_GL_Name"; + }; + class arifle_Mk20_GL_plain_F: arifle_Mk20_GL_F { + displayName = "$STR_ACE_RealisticNames_arifle_Mk20_GL_plain_Name"; + }; + + // Vector + class SMG_01_Base; + class SMG_01_F: SMG_01_Base { + displayName = "$STR_ACE_RealisticNames_SMG_01_Name"; + }; + + // Scorpion + class SMG_02_base_F; + class SMG_02_F: SMG_02_base_F { + displayName = "$STR_ACE_RealisticNames_SMG_02_Name"; + }; + + // PDW 2000 + class pdw2000_base_F; + class hgun_pdw2000_F: pdw2000_base_F { + displayName = "$STR_ACE_RealisticNames_hgun_PDW2000_Name"; + }; + + // pistols + class Pistol_Base_F; + class hgun_P07_F: Pistol_Base_F { + displayName = "$STR_ACE_RealisticNames_hgun_P07_Name"; + }; + + class hgun_Rook40_F: Pistol_Base_F { + displayName = "$STR_ACE_RealisticNames_hgun_Rook40_Name"; + }; + + class hgun_ACPC2_F: Pistol_Base_F { + displayName = "$STR_ACE_RealisticNames_hgun_ACPC2_Name"; + }; + + class hgun_Pistol_heavy_01_F: Pistol_Base_F { + displayName = "$STR_ACE_RealisticNames_hgun_Pistol_heavy_01_Name"; + }; + + class hgun_Pistol_heavy_02_F: Pistol_Base_F { + displayName = "$STR_ACE_RealisticNames_hgun_Pistol_heavy_02_Name"; + }; + + class hgun_Pistol_Signal_F: Pistol_Base_F { + displayName = "$STR_ACE_RealisticNames_hgun_Pistol_Signal_Name"; + }; + + // machine guns + class Rifle_Long_Base_F; + class LMG_Mk200_F: Rifle_Long_Base_F { + displayName = "$STR_ACE_RealisticNames_LMG_Mk200_Name"; + }; + + class LMG_Zafir_F: Rifle_Long_Base_F { + displayName = "$STR_ACE_RealisticNames_LMG_Zafir_Name"; + }; + + // sniper rifles + class EBR_base_F; + class srifle_EBR_F: EBR_base_F { + displayName = "$STR_ACE_RealisticNames_srifle_EBR_Name"; + }; + + class LRR_base_F; + class srifle_LRR_F: LRR_base_F { + displayName = "$STR_ACE_RealisticNames_srifle_LRR_Name"; + }; + class srifle_LRR_camo_F: srifle_LRR_F { + displayName = "$STR_ACE_RealisticNames_srifle_LRR_camo_Name"; + }; + + class GM6_base_F; + class srifle_GM6_F: GM6_base_F { + displayName = "$STR_ACE_RealisticNames_srifle_GM6_Name"; + }; + class srifle_GM6_camo_F: srifle_GM6_F { + displayName = "$STR_ACE_RealisticNames_srifle_GM6_camo_Name"; + }; + + class DMR_01_base_F; + class srifle_DMR_01_F: DMR_01_base_F { + displayName = "$STR_ACE_RealisticNames_srifle_DMR_01_Name"; + }; + + // launchers + class Launcher_Base_F; + class launch_RPG32_F: Launcher_Base_F { + displayName = "$STR_ACE_RealisticNames_launch_RPG32_Name"; + }; + + class launch_Titan_base: Launcher_Base_F { + displayName = "$STR_ACE_RealisticNames_launch_Titan_Name"; + }; + class launch_Titan_short_base: launch_Titan_base { + displayName = "$STR_ACE_RealisticNames_launch_Titan_short_Name"; + }; + + class launch_NLAW_F: Launcher_Base_F { + displayName = "$STR_ACE_RealisticNames_launch_NLAW_Name"; + }; + + // vehicle weapons + + // gatlings class CannonCore; - class RocketPods; - class MissileLauncher; - class MGunCore; - class MGun; - class LMG_RCWS; - class GMG_F; - class Bomb_04_Plane_CAS_01_F; - class autocannon_Base_F; - - // INFANTRY STUFF - // (I indented this on purpose, so you can collapse it in ST) - class arifle_MX_Base_F; - class arifle_MX_F : arifle_MX_Base_F { - displayName = "MX"; + class gatling_20mm: CannonCore { + //displayName = ""; + class manual: CannonCore { + //displayName = ""; }; - class arifle_MX_Black_F: arifle_MX_F { - displayName = "MX (Black)"; - }; - class arifle_MXC_F : arifle_MX_Base_F { - displayName = "MXC"; - }; - class arifle_MXC_Black_F: arifle_MXC_F { - displayName = "MXC (Black)"; - }; - class arifle_MX_GL_F : arifle_MX_Base_F { - displayName = "MX 3GL"; - }; - class arifle_MX_GL_Black_F : arifle_MX_GL_F { - displayName = "MX 3GL (Black)"; - }; - class arifle_MX_SW_F : arifle_MX_Base_F { - displayName = "MX LSW"; - }; - class arifle_MX_SW_Black_F : arifle_MX_SW_F { - displayName = "MX LSW (Black)"; - }; - class arifle_MXM_F : arifle_MX_Base_F { - displayName = "MXM"; - }; - class arifle_MXM_Black_F : arifle_MXM_F { - displayName = "MXM (Black)"; - }; - - class arifle_katiba_Base_F; - class arifle_Katiba_F : arifle_katiba_Base_F { - displayName = "KT2002 Katiba"; - }; - class arifle_Katiba_GL_F : arifle_katiba_Base_F { - displayName = "KT2002 Katiba KGL"; - }; - class arifle_Katiba_C_F : arifle_katiba_Base_F { - displayName = "KT2002C Katiba"; - }; - - class SDAR_base_F; - class arifle_SDAR_F : SDAR_base_F { - displayName = "RFB SDAR"; - }; - - class Tavor_base_F; - class arifle_TRG21_F : Tavor_base_F { - displayName = "TAR-21"; - }; - class arifle_TRG21_GL_F : arifle_TRG21_F { - displayName = "TAR-21 EGLM"; - }; - class arifle_TRG20_F : Tavor_base_F { - displayName = "CTAR-21"; - }; - - class mk20_base_F; - class arifle_Mk20_F : mk20_base_F { - displayName = "F2000 (Camo)"; - }; - class arifle_Mk20_plain_F : arifle_Mk20_F { - displayName = "F2000"; - }; - class arifle_Mk20C_F : mk20_base_F { - displayName = "F2000 Tactical (Camo)"; - }; - class arifle_Mk20C_plain_F : arifle_Mk20C_F { - displayName = "F2000 Tactical"; - }; - class arifle_Mk20_GL_F : mk20_base_F { - displayName = "F2000 EGLM (Camo)"; - }; - class arifle_Mk20_GL_plain_F : arifle_Mk20_GL_F { - displayName = "F2000 EGLM"; - }; - - class SMG_01_Base : Rifle_Base_F { - displayName = "Vector SMG"; - }; - class SMG_01_F : SMG_01_Base { - displayName = "Vector SMG"; - }; - - class SMG_02_base_F; - class SMG_02_F : SMG_02_base_F { - displayName = "Scorpion Evo 3 A1"; - }; - - class pdw2000_base_F; - class hgun_pdw2000_F : pdw2000_base_F { - displayName = "CPW"; - }; - - class Pistol_Base_F; - class hgun_P07_F : Pistol_Base_F { - displayName = "P99"; - }; - - class hgun_Rook40_F : Pistol_Base_F { - displayName = "MP-443 Grach"; - }; - - class hgun_ACPC2_F : Pistol_Base_F { - displayName = "ACP-C2"; - }; - - class hgun_Pistol_heavy_01_F: Pistol_Base_F { - displayName = "FNX-45 Tactical"; - }; - - class hgun_Pistol_heavy_02_F: Pistol_Base_F { - displayName = "Chiappa Rhino 60DS"; - }; - - class hgun_Pistol_Signal_F: Pistol_Base_F { - displayName = "Taurus Judge"; - }; - - class Rifle_Long_Base_F; - class LMG_Mk200_F : Rifle_Long_Base_F { - displayName = "Stoner 99 LMG"; - }; - - class LMG_Zafir_F: Rifle_Long_Base_F { - displayName = "Negev NG7"; - }; - - class EBR_base_F; - class srifle_EBR_F : EBR_base_F { - displayName = "Mk14 Mod 1 EBR"; - }; - - class LRR_base_F; - class srifle_LRR_F : LRR_base_F { - displayName = "M200 Intervention"; - }; - class srifle_LRR_camo_F : srifle_LRR_F { - displayName = "M200 Intervention (Camo)"; - }; - - class GM6_base_F; - class srifle_GM6_F : GM6_base_F { - displayName = "GM6 Lynx"; - }; - class srifle_GM6_camo_F : srifle_GM6_F { - displayName = "GM6 Lynx (Camo)"; - }; - - class DMR_01_base_F; - class srifle_DMR_01_F : DMR_01_base_F { - displayName = "VS-121"; - }; - - //MANPADS - class Launcher_Base_F; - class launch_RPG32_F: Launcher_Base_F { - displayName = "RPG-32"; - }; - class launch_Titan_base: Launcher_Base_F { - displayName = "Mini-Spike (AA)"; - }; - class launch_Titan_short_base: launch_Titan_base { - displayName = "Mini-Spike (AT)"; - }; - class launch_NLAW_F: Launcher_Base_F { - displayName = "NLAW"; - }; - - // VEHICLE STUFF - class gatling_20mm: CannonCore { - class manual; - }; - class Twin_Cannon_20mm: gatling_20mm { + }; + class Twin_Cannon_20mm: gatling_20mm { + displayName = "Plamen PL-20"; + class manual: manual { displayName = "Plamen PL-20"; - class manual: manual { - displayName = "Plamen PL-20"; - }; }; - class gatling_30mm: CannonCore { // This is a fictional veresion of the GSh-6-30, with 3 barrels + }; + + class gatling_30mm: CannonCore { // This is a fictional veresion of the GSh-6-30, with 3 barrels + displayName = "GSh-3-30"; + class LowROF: Mode_FullAuto { displayName = "GSh-3-30"; - class LowROF: Mode_FullAuto { - displayName = "GSh-3-30"; - }; }; - class Gatling_30mm_Plane_CAS_01_F: CannonCore { + }; + + class Gatling_30mm_Plane_CAS_01_F: CannonCore { + displayName = "GAU-8"; + class LowROF: Mode_FullAuto { displayName = "GAU-8"; - class LowROF: Mode_FullAuto { - displayName = "GAU-8"; - }; }; - class Cannon_30mm_Plane_CAS_02_F: CannonCore { + }; + + class Cannon_30mm_Plane_CAS_02_F: CannonCore { + displayName = "GSh-301"; + class LowROF: Mode_FullAuto { displayName = "GSh-301"; - class LowROF: Mode_FullAuto { - displayName = "GSh-301"; - }; }; - class Missile_AA_04_Plane_CAS_01_F: RocketPods { - displayName = "AIM-9 Sidewinder"; - }; - class Missile_AA_03_Plane_CAS_02_F: Missile_AA_04_Plane_CAS_01_F { - displayName = "Wympel R-73"; - }; - class Missile_AGM_02_Plane_CAS_01_F: MissileLauncher { - displayName = "AGM-65 Maverick"; - }; - class Missile_AGM_01_Plane_CAS_02_F: Missile_AGM_02_Plane_CAS_01_F { - displayName = "Kh-25MTP"; - }; - class Rocket_04_HE_Plane_CAS_01_F: RocketPods { + }; + + // missiles + class RocketPods; + class Missile_AA_04_Plane_CAS_01_F: RocketPods { + displayName = "AIM-9 Sidewinder"; + }; + class Missile_AA_03_Plane_CAS_02_F: Missile_AA_04_Plane_CAS_01_F { + displayName = "Wympel R-73"; + }; + + class MissileLauncher; + class Missile_AGM_02_Plane_CAS_01_F: MissileLauncher { + displayName = "AGM-65 Maverick"; + }; + class Missile_AGM_01_Plane_CAS_02_F: Missile_AGM_02_Plane_CAS_01_F { + displayName = "Kh-25MTP"; + }; + + // rockets + class Rocket_04_HE_Plane_CAS_01_F: RocketPods { + displayName = "Hydra 70"; + class Burst: RocketPods { displayName = "Hydra 70"; - class Burst: RocketPods { - displayName = "Hydra 70"; - }; }; - class Rocket_04_AP_Plane_CAS_01_F: Rocket_04_HE_Plane_CAS_01_F { - displayName = "Hydra 70"; - class Burst: RocketPods { - displayName = "Hydra 70"; - }; - }; - class Rocket_03_HE_Plane_CAS_02_F: Rocket_04_HE_Plane_CAS_01_F { + }; + class Rocket_04_AP_Plane_CAS_01_F: Rocket_04_HE_Plane_CAS_01_F { + displayName = "Hydra 70"; + }; + + class Rocket_03_HE_Plane_CAS_02_F: Rocket_04_HE_Plane_CAS_01_F { + displayName = "S-8"; + class Burst: Burst { displayName = "S-8"; - class Burst: Burst { - displayName = "S-8"; - }; }; - class Rocket_03_AP_Plane_CAS_02_F: Rocket_04_AP_Plane_CAS_01_F { + }; + class Rocket_03_AP_Plane_CAS_02_F: Rocket_04_AP_Plane_CAS_01_F { + displayName = "S-8"; + class Burst: Burst { displayName = "S-8"; - class Burst: Burst { - displayName = "S-8"; - }; }; - class rockets_Skyfire: RocketPods { + }; + + class rockets_Skyfire: RocketPods { + displayName = "Skyfire-70"; + class Burst: RocketPods { displayName = "Skyfire-70"; - class Burst: RocketPods { - displayName = "Skyfire-70"; - }; }; - class missiles_DAR: RocketPods { + }; + + // more missiles + class missiles_DAR: RocketPods { + displayName = "Hydra 70"; + class Burst: RocketPods { displayName = "Hydra 70"; - class Burst: RocketPods { - displayName = "Hydra 70"; - }; }; - class missiles_DAGR: RocketPods { + }; + + class missiles_DAGR: RocketPods { + displayName = "DAGR"; + class Burst: RocketPods { displayName = "DAGR"; - class Burst: RocketPods { - displayName = "DAGR"; - }; - }; - class missiles_ASRAAM: MissileLauncher { - displayName = "AIM-132 ASRAAM"; - }; - class missiles_Zephyr: MissileLauncher { - displayName = "AIM-120A AMRAAM"; - }; - class missiles_SCALPEL: RocketPods { // according to zGuba, this is what it's based on - displayName = "9K121 Vikhr"; - }; - class Bomb_03_Plane_CAS_02_F: Bomb_04_Plane_CAS_01_F { - displayName = "FAB-250M-54"; }; + }; - class M134_minigun: MGunCore { - displayName = "2x M134 Minigun"; - }; - class LMG_Minigun: LMG_RCWS { + class missiles_ASRAAM: MissileLauncher { + displayName = "AIM-132 ASRAAM"; + }; + + class missiles_Zephyr: MissileLauncher { + displayName = "AIM-120A AMRAAM"; + }; + + class missiles_SCALPEL: RocketPods { // according to zGuba, this is what it's based on + displayName = "9K121 Vikhr"; + }; + + // bomb + class Bomb_04_Plane_CAS_01_F: RocketPods { + //displayName = ""; + }; + class Bomb_03_Plane_CAS_02_F: Bomb_04_Plane_CAS_01_F { + displayName = "FAB-250M-54"; + }; + + // machine guns + class MGunCore; + class M134_minigun: MGunCore { + displayName = "2x M134 Minigun"; + }; + + class LMG_RCWS; + class MGun; + + class LMG_Minigun: LMG_RCWS { + displayName = "M134 Minigun"; + class manual: MGun { displayName = "M134 Minigun"; - class manual: MGun { - displayName = "M134 Minigun"; - }; }; - class HMG_127: LMG_RCWS { - displayName = "M2"; - class manual: MGun { - displayName = "M2"; - }; - }; - class HMG_01: HMG_127 { - displayName = "XM312"; - }; - class HMG_M2: HMG_01 { + }; + + class HMG_127: LMG_RCWS { + displayName = "M2"; + class manual: MGun { displayName = "M2"; }; - class HMG_NSVT: HMG_127 { + }; + + class HMG_01: HMG_127 { + displayName = "XM312"; + }; + class HMG_M2: HMG_01 { + displayName = "M2"; + }; + + class HMG_NSVT: HMG_127 { + displayName = "NSVT"; + class manual: manual { displayName = "NSVT"; - class manual: manual { - displayName = "NSVT"; - }; }; - class GMG_20mm: GMG_F { + }; + + // grenade launchers + class GMG_F; + class GMG_20mm: GMG_F { + displayName = "XM307"; + class manual: GMG_F { displayName = "XM307"; - class manual: GMG_F { - displayName = "XM307"; - }; }; - class GMG_40mm: GMG_F { + }; + + class GMG_40mm: GMG_F { + displayName = "Mk 19"; + class manual: GMG_F { displayName = "Mk 19"; - class manual: GMG_F { - displayName = "Mk 19"; - }; + }; + }; + + // autocannons + class autocannon_35mm: CannonCore { + displayName = "GDF-001"; + class manual: CannonCore { + displayName = "GDF-001"; + }; + }; + + // aa missiles + class missiles_titan: MissileLauncher { + displayName = "Mini-Spike"; + }; + + // mortar + class mortar_155mm_AMOS: CannonCore { + displayName = "L/52"; + }; + + // artillery rockets + class rockets_230mm_GAT: RocketPods { + displayName = "M269"; + }; + + // tank guns + class cannon_120mm: CannonCore { + class player; + displayName = "MG251"; + }; + + class cannon_120mm_long: cannon_120mm { + displayName = "L/55"; + class player: player {}; + }; + + class cannon_105mm: cannon_120mm { + displayName = "M68"; + class player: player { + displayName = "M68"; + }; + }; + + class cannon_125mm: cannon_120mm { + displayName = "2A46"; + }; + + // coax machine guns + class LMG_coax: LMG_RCWS { + displayName = "PKT"; + }; + + class ACE_LMG_coax_MBT_01: LMG_coax { + displayName = "MAG 58"; + }; + + class ACE_LMG_coax_APC_Tracked_03: LMG_coax { + displayName = "L94A1"; + }; + + // more autocannons + class autocannon_Base_F; + class autocannon_40mm_CTWS: autocannon_Base_F { + displayName = "Mk44 Bushmaster II"; + class AP: autocannon_Base_F { + displayName = "Mk44 Bushmaster II"; }; - class autocannon_35mm: CannonCore { - displayName = "GDF-001"; - class manual: CannonCore { - displayName = "GDF-001"; - }; - }; - class missiles_titan: MissileLauncher { - displayName = "Mini-Spike"; - }; - class mortar_155mm_AMOS: CannonCore { - displayName = "L/52"; - }; - class rockets_230mm_GAT: RocketPods { - displayName = "M269"; - }; - class cannon_120mm: CannonCore { - class player; - displayName = "MG251"; - }; - class cannon_120mm_long: cannon_120mm { - displayName = "L/55"; - class player: player {}; - }; - class cannon_105mm: cannon_120mm { - displayName = "M68"; - class player: player { - displayName = "M68"; - }; - }; - class cannon_125mm: cannon_120mm { - displayName = "2A46"; - }; - class LMG_coax: LMG_RCWS { - displayName = "PKT"; - }; - class AGM_LMG_coax_MBT_01: LMG_coax { - displayName = "MAG 58"; - }; - class AGM_LMG_coax_APC_Tracked_03: LMG_coax { - displayName = "L94A1"; - }; - class autocannon_40mm_CTWS: autocannon_Base_F { + class HE: autocannon_Base_F { displayName = "Mk44 Bushmaster II"; - class AP: autocannon_Base_F { - displayName = "Mk44 Bushmaster II"; - }; - class HE: autocannon_Base_F { - displayName = "Mk44 Bushmaster II"; - }; }; - class autocannon_30mm_CTWS: autocannon_Base_F { + }; + + class autocannon_30mm_CTWS: autocannon_Base_F { + displayName = "Mk44 Bushmaster II"; + class AP: autocannon_Base_F { displayName = "Mk44 Bushmaster II"; - class AP: autocannon_Base_F { - displayName = "Mk44 Bushmaster II"; - }; - class HE: autocannon_Base_F { - displayName = "Mk44 Bushmaster II"; - }; }; - class autocannon_30mm: autocannon_30mm_CTWS { + + class HE: autocannon_Base_F { + displayName = "Mk44 Bushmaster II"; + }; + }; + + class autocannon_30mm: autocannon_30mm_CTWS { + displayName = "L21A1 RARDEN"; + class AP: AP { displayName = "L21A1 RARDEN"; - class AP: AP { - displayName = "L21A1 RARDEN"; - }; - class HE: HE { - displayName = "L21A1 RARDEN"; - }; }; + + class HE: HE { + displayName = "L21A1 RARDEN"; + }; + }; }; class CfgMagazines { class VehicleMagazine; - class 2000Rnd_65x39_Belt; - class 1000Rnd_Gatling_30mm_Plane_CAS_01_F: VehicleMagazine { displayNameShort = "30mm HEI"; }; + class 7Rnd_Rocket_04_HE_F: VehicleMagazine { displayNameShort = "70mm HE"; }; class 7Rnd_Rocket_04_AP_F: 7Rnd_Rocket_04_HE_F { displayNameShort = "70mm AP"; }; + class 24Rnd_PG_missiles: VehicleMagazine { displayNameShort = "70mm HE"; }; class 12Rnd_PG_missiles: 24Rnd_PG_missiles { displayNameShort = "70mm HE"; }; + + class 2000Rnd_65x39_Belt; class 5000Rnd_762x51_Belt: 2000Rnd_65x39_Belt { displayNameShort = "7.62mm"; }; class 5000Rnd_762x51_Yellow_Belt: 5000Rnd_762x51_Belt { displayNameShort = "7.62mm"; }; + class 500Rnd_127x99_mag: VehicleMagazine { displayNameShort = "12.7mm"; }; @@ -931,6 +1069,7 @@ class CfgMagazines { class 500Rnd_127x99_mag_Tracer_Yellow: 500Rnd_127x99_mag { displayNameShort = "12.7mm"; }; + class 200Rnd_127x99_mag: 500Rnd_127x99_mag { displayNameShort = "12.7mm"; }; @@ -943,6 +1082,7 @@ class CfgMagazines { class 200Rnd_127x99_mag_Tracer_Yellow: 200Rnd_127x99_mag { displayNameShort = "12.7mm"; }; + class 100Rnd_127x99_mag: 500Rnd_127x99_mag { displayNameShort = "12.7mm"; }; @@ -955,33 +1095,42 @@ class CfgMagazines { class 100Rnd_127x99_mag_Tracer_Yellow: 100Rnd_127x99_mag { displayNameShort = "12.7mm"; }; + class 200Rnd_40mm_G_belt: VehicleMagazine { displayNameShort = "40mm HE"; }; + class 24Rnd_missiles: VehicleMagazine { displayNameShort = "70mm HE"; }; + class 300Rnd_20mm_shells: VehicleMagazine { displayNameShort = "20mm HE"; }; + class 14Rnd_80mm_rockets: VehicleMagazine { displayNameShort = "70mm HE"; }; + class 250Rnd_30mm_HE_shells: VehicleMagazine { displayNameShort = "30mm HE"; }; class 250Rnd_30mm_APDS_shells: 250Rnd_30mm_HE_shells { displayNameShort = "30mm APDS"; }; + class 20Rnd_Rocket_03_HE_F: 7Rnd_Rocket_04_HE_F { displayNameShort = "80mm HE"; }; + class 20Rnd_Rocket_03_AP_F: 7Rnd_Rocket_04_AP_F { displayNameShort = "80mm AP"; }; + class 500Rnd_Cannon_30mm_Plane_CAS_02_F: 1000Rnd_Gatling_30mm_Plane_CAS_01_F { displayNameShort = "30mm HEI-T"; }; + class 680Rnd_35mm_AA_shells: VehicleMagazine { displayNameShort = "35mm HEI"; }; @@ -994,6 +1143,7 @@ class CfgMagazines { class 680Rnd_35mm_AA_shells_Tracer_Yellow: 680Rnd_35mm_AA_shells { displayNameShort = "35mm HEI-T"; }; + class 32Rnd_155mm_Mo_shells: VehicleMagazine { displayNameShort = "155mm HE"; }; @@ -1015,10 +1165,12 @@ class CfgMagazines { class 2Rnd_155mm_Mo_LG: 6Rnd_155mm_Mo_smoke { displayNameShort = "155mm Laser Guided"; }; + class 12Rnd_230mm_rockets: 14Rnd_80mm_rockets { displayName = "227mm HE Missile"; displayNameShort = "227mm HE"; }; + class 30Rnd_120mm_HE_shells: VehicleMagazine { displayNameShort = "120mm HE"; }; @@ -1031,6 +1183,7 @@ class CfgMagazines { class 30Rnd_120mm_HE_shells_Tracer_Yellow: 30Rnd_120mm_HE_shells { displayNameShort = "120mm HE-T"; }; + class 30Rnd_120mm_APFSDS_shells: 30Rnd_120mm_HE_shells { displayNameShort = "120mm AP"; }; @@ -1043,6 +1196,7 @@ class CfgMagazines { class 30Rnd_120mm_APFSDS_shells_Tracer_Yellow: 30Rnd_120mm_APFSDS_shells { displayNameShort = "120mm AP-T"; }; + class 200Rnd_762x51_Belt: VehicleMagazine { displayNameShort = "7.62mm"; }; @@ -1058,44 +1212,53 @@ class CfgMagazines { class 200Rnd_762x51_Belt_T_Yellow: 200Rnd_762x51_Belt_Yellow { displayNameShort = "7.62mm"; }; + class 2000Rnd_762x51_Belt_Red; class 2000Rnd_762x51_Belt_T_Red: 2000Rnd_762x51_Belt_Red { displayNameShort = "7.62mm"; }; + class 2000Rnd_762x51_Belt_Green; class 2000Rnd_762x51_Belt_T_Green: 2000Rnd_762x51_Belt_Green { displayNameShort = "7.62mm"; }; + class 2000Rnd_762x51_Belt_Yellow; class 2000Rnd_762x51_Belt_T_Yellow: 2000Rnd_762x51_Belt_Yellow { displayNameShort = "7.62mm"; }; + class 1000Rnd_762x51_Belt_Red; class 1000Rnd_762x51_Belt_T_Red: 1000Rnd_762x51_Belt_Red { displayNameShort = "7.62mm"; }; + class 1000Rnd_762x51_Belt_Green; class 1000Rnd_762x51_Belt_T_Green: 1000Rnd_762x51_Belt_Green { displayNameShort = "7.62mm"; }; + class 1000Rnd_762x51_Belt_Yellow; class 1000Rnd_762x51_Belt_T_Yellow: 1000Rnd_762x51_Belt_Yellow { displayNameShort = "7.62mm"; }; class 16Rnd_120mm_HE_shells; - class 16Rnd_120mm_HE_shells_Tracer_Red; - class 16Rnd_120mm_HE_shells_Tracer_Green; - class 16Rnd_120mm_HE_shells_Tracer_Yellow; class 12Rnd_125mm_HE: 16Rnd_120mm_HE_shells { displayNameShort = "125mm HE"; }; + + class 16Rnd_120mm_HE_shells_Tracer_Red; class 12Rnd_125mm_HE_T_Red: 16Rnd_120mm_HE_shells_Tracer_Red { displayNameShort = "125mm HE-T"; }; + + class 16Rnd_120mm_HE_shells_Tracer_Green; class 12Rnd_125mm_HE_T_Green: 16Rnd_120mm_HE_shells_Tracer_Green { displayNameShort = "125mm HE-T"; }; + + class 16Rnd_120mm_HE_shells_Tracer_Yellow; class 12Rnd_125mm_HE_T_Yellow: 16Rnd_120mm_HE_shells_Tracer_Yellow { displayNameShort = "125mm HE-T"; }; @@ -1114,18 +1277,21 @@ class CfgMagazines { }; class 32Rnd_120mm_APFSDS_shells; - class 32Rnd_120mm_APFSDS_shells_Tracer_Red; - class 32Rnd_120mm_APFSDS_shells_Tracer_Green; - class 32Rnd_120mm_APFSDS_shells_Tracer_Yellow; class 24Rnd_125mm_APFSDS: 32Rnd_120mm_APFSDS_shells { displayNameShort = "125mm AP"; }; + + class 32Rnd_120mm_APFSDS_shells_Tracer_Red; class 24Rnd_125mm_APFSDS_T_Red: 32Rnd_120mm_APFSDS_shells_Tracer_Red { displayNameShort = "125mm AP-T"; }; + + class 32Rnd_120mm_APFSDS_shells_Tracer_Green; class 24Rnd_125mm_APFSDS_T_Green: 32Rnd_120mm_APFSDS_shells_Tracer_Green { displayNameShort = "125mm AP-T"; }; + + class 32Rnd_120mm_APFSDS_shells_Tracer_Yellow; class 24Rnd_125mm_APFSDS_T_Yellow: 32Rnd_120mm_APFSDS_shells_Tracer_Yellow { displayNameShort = "125mm AP-T"; }; @@ -1142,6 +1308,7 @@ class CfgMagazines { class 20Rnd_105mm_HEAT_MP_T_Yellow: 20Rnd_105mm_HEAT_MP { displayNameShort = "105mm MP-T"; }; + class 40Rnd_105mm_APFSDS: 24Rnd_125mm_APFSDS { displayNameShort = "105mm AP"; }; @@ -1154,6 +1321,7 @@ class CfgMagazines { class 40Rnd_105mm_APFSDS_T_Yellow: 40Rnd_105mm_APFSDS { displayNameShort = "105mm AP-T"; }; + class 60Rnd_40mm_GPR_shells: VehicleMagazine { displayNameShort = "40mm GPR"; }; @@ -1166,6 +1334,7 @@ class CfgMagazines { class 60Rnd_40mm_GPR_Tracer_Yellow_shells: 60Rnd_40mm_GPR_shells { displayNameShort = "40mm GPR-T"; }; + class 40Rnd_40mm_APFSDS_shells: 60Rnd_40mm_GPR_shells { displayNameShort = "40mm AP"; }; @@ -1178,6 +1347,7 @@ class CfgMagazines { class 40Rnd_40mm_APFSDS_Tracer_Yellow_shells: 40Rnd_40mm_APFSDS_Tracer_Red_shells { displayNameShort = "40mm AP-T"; }; + class 450Rnd_127x108_Ball: VehicleMagazine { displayNameShort = "12.7mm"; }; @@ -1194,6 +1364,7 @@ class CfgMagazines { class 140Rnd_30mm_MP_shells_Tracer_Yellow: 140Rnd_30mm_MP_shells_Tracer_Red { displayNameShort = "30mm MP-T"; }; + class 60Rnd_30mm_APFSDS_shells: 250Rnd_30mm_HE_shells { displayNameShort = "30mm AP"; }; @@ -1214,60 +1385,65 @@ class CfgMagazines { displayNameShort = "20mm HE"; }; - - // EXPLOSIVES + // mines class CA_Magazine; // http://en.wikipedia.org/wiki/M15_mine class ATMine_Range_Mag: CA_Magazine { - displayName = "$STR_AGM_RealisticNames_ATMine_Name"; + displayName = "$STR_ACE_RealisticNames_ATMine_Name"; }; // http://en.wikipedia.org/wiki/VS-50_mine class APERSMine_Range_Mag: ATMine_Range_Mag { - displayName = "$STR_AGM_RealisticNames_APERSMine_Name"; + displayName = "$STR_ACE_RealisticNames_APERSMine_Name"; }; // https://www.buymilsurp.com/us-m26-antipersonnel-bounding-mine-p-5419.html class APERSBoundingMine_Range_Mag: ATMine_Range_Mag { - displayName = "$STR_AGM_RealisticNames_APERSBoundingMine_Name"; + displayName = "$STR_ACE_RealisticNames_APERSBoundingMine_Name"; }; // http://en.wikipedia.org/wiki/PMR-3_mine class APERSTripMine_Wire_Mag: ATMine_Range_Mag { - displayName = "$STR_AGM_RealisticNames_APERSTripwireMine_Name"; + displayName = "$STR_ACE_RealisticNames_APERSTripwireMine_Name"; }; // the following ones can be found here: http://www.dtic.mil/dtic/tr/fulltext/u2/a567897.pdf class SLAMDirectionalMine_Wire_Mag: ATMine_Range_Mag { - displayName = "$STR_AGM_RealisticNames_SLAM_Name"; + displayName = "$STR_ACE_RealisticNames_SLAM_Name"; }; + + // claymore class ClaymoreDirectionalMine_Remote_Mag: CA_Magazine { - displayName = "$STR_AGM_RealisticNames_Claymore_Name"; + displayName = "$STR_ACE_RealisticNames_Claymore_Name"; }; + + // satchels class SatchelCharge_Remote_Mag: CA_Magazine { - displayName = "$STR_AGM_RealisticNames_SatchelCharge_Name"; + displayName = "$STR_ACE_RealisticNames_SatchelCharge_Name"; }; class DemoCharge_Remote_Mag: SatchelCharge_Remote_Mag { - displayName = "$STR_AGM_RealisticNames_DemoCharge_Name"; + displayName = "$STR_ACE_RealisticNames_DemoCharge_Name"; }; + + // hand grenades class HandGrenade: CA_Magazine { - displayName = "$STR_AGM_RealisticNames_HandGrenade_Name"; + displayName = "$STR_ACE_RealisticNames_HandGrenade_Name"; }; class SmokeShell: HandGrenade { - displayName = "$STR_AGM_RealisticNames_SmokeShell_Name"; + displayName = "$STR_ACE_RealisticNames_SmokeShell_Name"; }; class SmokeShellBlue: SmokeShell { - displayName = "$STR_AGM_RealisticNames_SmokeShellBlue_Name"; + displayName = "$STR_ACE_RealisticNames_SmokeShellBlue_Name"; }; class SmokeShellGreen: SmokeShell { - displayName = "$STR_AGM_RealisticNames_SmokeShellGreen_Name"; + displayName = "$STR_ACE_RealisticNames_SmokeShellGreen_Name"; }; class SmokeShellOrange: SmokeShell { - displayName = "$STR_AGM_RealisticNames_SmokeShellOrange_Name"; + displayName = "$STR_ACE_RealisticNames_SmokeShellOrange_Name"; }; class SmokeShellPurple: SmokeShell { - displayName = "$STR_AGM_RealisticNames_SmokeShellPurple_Name"; + displayName = "$STR_ACE_RealisticNames_SmokeShellPurple_Name"; }; class SmokeShellRed: SmokeShell { - displayName = "$STR_AGM_RealisticNames_SmokeShellRed_Name"; + displayName = "$STR_ACE_RealisticNames_SmokeShellRed_Name"; }; class SmokeShellYellow: SmokeShell { - displayName = "$STR_AGM_RealisticNames_SmokeShellYellow_Name"; + displayName = "$STR_ACE_RealisticNames_SmokeShellYellow_Name"; }; }; diff --git a/addons/realisticnames/script_component.hpp b/addons/realisticnames/script_component.hpp new file mode 100644 index 0000000000..74a7dd413f --- /dev/null +++ b/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" \ No newline at end of file diff --git a/TO_MERGE/agm/RealisticNames/stringtable.xml b/addons/realisticnames/stringtable.xml similarity index 77% rename from TO_MERGE/agm/RealisticNames/stringtable.xml rename to addons/realisticnames/stringtable.xml index e72608f6b5..ed70a3a00d 100644 --- a/TO_MERGE/agm/RealisticNames/stringtable.xml +++ b/addons/realisticnames/stringtable.xml @@ -1,8 +1,8 @@  - + - + XM312 XM312 XM312 @@ -14,7 +14,7 @@ XM312 XM312A - + XM312A XM312A XM312 @@ -26,7 +26,7 @@ XM312A XM312A - + XM312 (High) XM312 (Hoch) XM312 (Alto) @@ -38,7 +38,7 @@ XM312 (Magasított) XM312 (Alta) - + XM307 XM307 XM307 @@ -50,7 +50,7 @@ XM307 XM307 - + XM307A XM307A XM307A @@ -62,7 +62,7 @@ XM307A XM307A - + XM307 (High) XM307 (Hoch) XM307 (Alto) @@ -74,7 +74,7 @@ XM307 (Magasított) XM307 (Alta) - + Mini-Spike Launcher (AT) Mini-Spike Lenkflugkörper (AT) Lanzador Mini-Spike (AT) @@ -86,7 +86,7 @@ Mini-Spike rakétarendszer (páncéltörő) Lanciatore Mini-Spike (AC) - + Mini-Spike Launcher (AA) Mini-Spike Lenkflugkörper (AA) Lanzador Mini-Spike (AA) @@ -98,7 +98,7 @@ Mini-Spike rakétarendszer (légvédelmi) Lanciatore Mini-Spike (AA) - + YABHON-R3 YABHON-R3 YABHON-R3 @@ -110,7 +110,7 @@ YABHON-R3 YABHON-R3 - + YABHON-R3 (CAS) YABHON-R3 (Luftnahunterstützung) YABHON-R3 (CAS) @@ -118,7 +118,7 @@ YABHON-R3 (CAS) YABHON-R3 (штурмовик) - + M-ATV M-ATV M-ATV @@ -130,7 +130,7 @@ M-ATV M-ATV - + M-ATV (HMG) M-ATV (SMG) M-ATV (HMG) @@ -142,7 +142,7 @@ M-ATV (HMG) M-ATV (HMG) - + M-ATV (GMG) M-ATV (GMW) M-ATV (GMG) @@ -154,7 +154,7 @@ M-ATV (GMG) M-ATV (GMG) - + Merkava Mk IV M Merkava Mk IV M Merkava Mk IV M @@ -166,7 +166,7 @@ Merkava Mk IV M Merkava Mk IV M - + Merkava Mk IV LIC Merkava Mk IV LIC Merkava Mk IV LIC @@ -178,7 +178,7 @@ Merkava Mk IV LIC Merkava Mk IV LIC - + Sholef Sholef Sholef @@ -190,7 +190,7 @@ Sholef Sholef - + Seara Seara Seara @@ -202,7 +202,7 @@ Seara Seara - + Namer Namer Namer @@ -214,7 +214,7 @@ Namer Namer - + Bardelas Bardelas Bardelas @@ -226,7 +226,7 @@ Bardelas Bardelas - + Patria AMV Patria AMV Patria AMV @@ -238,7 +238,7 @@ Patria AMV Patria AMV - + Nemmera Nemmera Nemmera @@ -250,7 +250,7 @@ Nemmera Nemmera - + HEMTT Transport HEMTT Transport HEMTT de transporte @@ -262,7 +262,7 @@ HEMTT szállítójármű HEMTT da trasporto - + HEMTT Transport (covered) HEMTT Transport (bedeckt) HEMTT de transporte (cubierto) @@ -274,7 +274,7 @@ HEMTT szállítójármű (ponyvás) HEMTT da trasporto (coperto) - + HEMTT HEMTT HEMTT @@ -286,7 +286,7 @@ HEMTT HEMTT - + HEMTT Container HEMTT Container HEMTT de contenedor @@ -298,7 +298,7 @@ HEMTT Konténer HEMTT portacontainer - + HEMTT Medical HEMTT Sanitäter HEMTT médico @@ -310,7 +310,7 @@ HEMTT (egészségügyi) HEMTT Medico - + HEMTT Ammo HEMTT Munition HEMTT de munición @@ -322,7 +322,7 @@ HEMTT (lőszerszállító) HEMTT di rifornimento munizioni - + HEMTT Fuel HEMTT Treibstoff HEMTT de combustible @@ -334,7 +334,7 @@ HEMTT (üzemanyag-szállító) HEMTT di rifornimento carburante - + HEMTT Repair HEMTT Instandsetzung HEMTT de reparación @@ -346,7 +346,7 @@ HEMTT (szerelő-jármű) HEMTT Riparatore - + Fennek Fennek Fennek @@ -358,7 +358,7 @@ Fennek Fennek - + Fennek (HMG) Fennek (SMG) Fennek (HMG) @@ -370,7 +370,7 @@ Fennek (HMG) Fennek (HMG) - + Fennek (GMG) Fennek (GMW) Fennek (GMG) @@ -382,7 +382,7 @@ Fennek (GMG) Fennek (GMG) - + Leopard 2SG Leopard 2SG Leopard 2SG @@ -394,7 +394,7 @@ Leopard 2SG Leopard 2SG - + FV510 Warrior FV510 Warrior FV510 Warrior @@ -406,7 +406,7 @@ FV510 Warrior FV510 Warrior - + Pandur II Pandur II Pandur II @@ -418,7 +418,7 @@ Pandur II Pandur II - + KamAZ Transport KamAZ Transport KamAZ de transporte @@ -430,7 +430,7 @@ KamAZ szállítójármű KamAZ da trasporto - + KamAZ Transport (covered) KamAZ Transport (bedeckt) KamAZ de transporte (cubierto) @@ -442,7 +442,7 @@ KamAZ szállítójármű (ponyvás) KamAZ da trasporto (coperto) - + KamAZ Ammo KamAZ Munition KamAZ de munición @@ -454,7 +454,7 @@ KamAZ (lőszerszállító) KamAZ di rifornimento munizioni - + KamAZ Fuel KamAZ Treibstoff KamAZ de combustible @@ -466,7 +466,7 @@ KamAZ (üzemanyag-szállító) KamAZ di rifornimento carburante - + KamAZ Repair KamAZ Instandsetzung KamAZ de reparación @@ -478,7 +478,7 @@ KamAZ (szerelő-jármű) KamAZ riparatore - + KamAZ Medical KamAZ Sanitäter KamAZ médico @@ -490,7 +490,7 @@ KamAZ (egészségügyi) KamAZ Medico - + Punisher Punisher Punisher @@ -502,7 +502,7 @@ Punisher Punisher - + Punisher (HMG) Punisher (SMG) Punisher (HMG) @@ -514,7 +514,7 @@ Punisher (HMG) Punisher (HMG) - + Punisher (GMG) Punisher (GMW) Punisher (GMG) @@ -526,7 +526,7 @@ Punisher (GMG) Punisher (GMG) - + T100 Black Eagle T100 Black Eagle T100 Black Eagle @@ -538,7 +538,7 @@ T100 Black Eagle T100 Black Eagle - + 2S9 Sochor 2S9 Sochor 2S9 Sochor @@ -550,7 +550,7 @@ 2S9 Sochor 2S9 Sochor - + BM-2T Stalker BM-2T Stalker BM-2T Stalker @@ -562,7 +562,7 @@ BM-2T Stalker BM-2T Stalker - + ZSU-35 Tigris ZSU-35 Tigris ZSU-35 Tigris @@ -574,7 +574,7 @@ ZSU-35 Tigris ZSU-35 Tigris - + Otokar ARMA Otokar ARMA Otokar ARMA @@ -586,7 +586,7 @@ Otokar ARMA Otokar ARMA - + Typhoon Transport Typhoon Transport Typhoon de transporte @@ -598,7 +598,7 @@ Typhoon szállítójármű Typhoon da trasporto - + Typhoon Transport (covered) Typhoon Transport (bedeckt) Typhoon de transporte (cubierto) @@ -610,7 +610,7 @@ Typhoon szállítójármű (ponyvás) Typhoon da trasporto (coperto) - + Typhoon Device Typhoon Gerät Typhoon de dispositivo @@ -622,7 +622,7 @@ Typhoon (szerkezet) Typhoon per dispositivo - + Typhoon Ammo Typhoon Munition Typhoon de munición @@ -634,7 +634,7 @@ Typhoon (lőszerszállító) Typhoon di rifornimento munizioni - + Typhoon Fuel Typhoon Treibstoff Typhoon de combustible @@ -646,7 +646,7 @@ Typhoon (üzemanyag-szállító) Typhoon di rifornimento carburante - + Typhoon Repair Typhoon Instandsetzung Typhoon de reparación @@ -658,7 +658,7 @@ Typhoon (szerelő-jármű) Typhoon riparatore - + Typhoon Medical Typhoon Sanitäter Typhoon médico @@ -670,7 +670,7 @@ Typhoon (egészségügyi) Typhoon medico - + RAH-66 Comanche RAH-66 Comanche RAH-66 Comanche @@ -682,7 +682,7 @@ RAH-66 Comanche RAH-66 Comanche - + MH-6 Little Bird MH-6 Little Bird MH-6 Litte Bird @@ -694,7 +694,7 @@ MH-6 Little Bird MH-6 Little Bird - + AH-6 Little Bird AH-6 Little Bird AH-6 Little Bird @@ -706,7 +706,7 @@ AH-6 Little Bird AH-6 Little Bird - + CH-47I Chinook CH-47I Chinook CH-47I Chinook @@ -718,7 +718,7 @@ CH-47I Chinook CH-47I Chinook - + CH-47I Chinook (unarmed) CH-47I Chinook (unbewaffnet) CH-47I Chinnok (Desarmado) @@ -726,7 +726,7 @@ CH-47I Chinook (невооруженный) CH-47I Chinook (Neozbrojený) - + A-10D Thunderbolt II A-10D Thunderbolt II A-10D Thunderbolt II @@ -738,7 +738,7 @@ A-10D Thunderbolt II A-10D Thunderbolt II - + AW159 Wildcat AW159 Wildcat AW159 Wildcat @@ -750,7 +750,7 @@ AW159 Wildcat AW159 Wildcat - + AW159 Wildcat (unarmed) AW159 Wildcat (unbewaffnet) AW159 Wildcat (desarmado) @@ -762,7 +762,7 @@ AW159 Wildcat (fegyvertelen) AW159 Wildcat (disarmato) - + AW101 Merlin AW101 Merlin AW101 Merlin @@ -774,7 +774,7 @@ AW101 Merlin AW101 Merlin - + L-159 ALCA (CAS) L-159 ALCA (CAS) L-159 ALCA (CAS) @@ -786,7 +786,7 @@ L-159 ALCA (CAS) L-159 ALCA (CAS) - + L-159 ALCA (AA) L-159 ALCA (AA) L-159 ALCA (AA) @@ -798,7 +798,7 @@ L-159 ALCA (AA) L-159 ALCA (AA) - + Ka-60 Kasatka Ka-60 Kasatka Ka-60 Kasatka @@ -810,7 +810,7 @@ Ka-60 Kasatka Ka-60 Kasatka - + Ka-60 Kasatka (unarmed) Ka-60 Kasatka (unbewaffnet) Ka-60 Kasatka (desarmado) @@ -822,7 +822,7 @@ Ka-60 Kasatka (fegyvertelen) Ka-60 Kasatka (disarmato) - + Yak-130 Yak-130 Yak-130 @@ -834,7 +834,7 @@ Jak-130 Yak-130 - + MD 500 MD 500 MD 500 @@ -846,7 +846,7 @@ MD 500 MD 500 - + M4A1 SLAM M4A1 SLAM M4A1 SLAM @@ -858,7 +858,7 @@ M4A1 SLAM M4A1 SLAM - + M18A1 Claymore M18A1 Claymore M18A1 Claymore @@ -870,7 +870,7 @@ M18A1 Claymore akna M18A1 Claymore Mina antiuomo - + M183 Demolition Charge Assembly M183 Geballte Sprengladung Conjunto de carga de demolición M183 @@ -882,7 +882,7 @@ M183 romboló töltet M183 Demolition Charge Assembly - + M112 Demolition Block M112 Sprengladung Bloque de demolición M112 @@ -894,7 +894,7 @@ M112 romboló töltet M112 Demolition Block - + M67 Fragmentation Grenade M67 Splittergranate Granada de fragmentación M67 @@ -906,7 +906,7 @@ M67 repeszgránát M67 Granata a frammentazione - + M83 Smoke Grenade (White) M83 Rauchgranate (Weiss) Granada de humo M83 (Blanco) @@ -918,7 +918,7 @@ M83 füstgránát (Fehér) M83 Granata fumogena (Bianco) - + M18 Smoke Grenade (Blue) M18 Rauchgranate (Blau) Granada de humo M18 (Azul) @@ -930,7 +930,7 @@ M18 füstgránát (Kék) M18 Granata fumogena (Blu) - + M18 Smoke Grenade (Green) M18 Rauchgranate (Grün) Granada de humo M18 (Verde) @@ -942,7 +942,7 @@ M18 füstgránát (Zöld) M18 Granata fumogena (Verde) - + M18 Smoke Grenade (Orange) M18 Rauchgranate (Orange) Granada de humo M18 (Naranja) @@ -954,7 +954,7 @@ M18 füstgránát (Narancssárga) M18 Granata fumogena (Arancione) - + M18 Smoke Grenade (Purple) M18 Rauchgranate (Violett) Granada de humo M18 (Púrpura) @@ -966,7 +966,7 @@ M18 füstgránát (Lila) M18 Granata fumogena (Viola) - + M18 Smoke Grenade (Red) M18 Rauchgranate (Rot) Granada de humo M18 (Rojo) @@ -978,7 +978,7 @@ M18 füstgránát (Piros) M18 Granata fumogena (Rosso) - + M18 Smoke Grenade (Yellow) M18 Rauchgranate (Gelb) Granada de humo M18 (Amarillo) @@ -990,7 +990,7 @@ M18 füstgránát (Sárga) M18 Granata fumogena (Giallo) - + M15 Anti-Tank Mine M15 Panzerabwehrmine Mina antitanque M15 @@ -1002,7 +1002,7 @@ M15 harckocsiakna M15 Mine anticarro - + VS-50 Anti-Personnel Mine VS-50 Antipersonenmine Mina antipersona VS-50 @@ -1014,7 +1014,7 @@ VS-50 gyalogsági taposóakna VS-50 Mine antiuomo - + M26 Anti-Personnel Bounding Mine M26 Antipersonensprungmine Mina antipersona M26 @@ -1026,7 +1026,7 @@ M26 gyalogsági ugróakna M26 Mine saltanti antiuomo - + PMR-3 Anti-Personnel Tripwire Mine PMR-3 Antipersonenstolperdrahtmine Mina antipersona de alambre PMR-3 @@ -1038,5 +1038,181 @@ PMR-3 botlódrótos gyalogsági akna PMR-3 Mine antiuomo + + P99 + P99 + + + MP-443 Grach + MP-443 Grach + + + ACP-C2 + ACP-C2 + + + FNX-45 Tactical + FNX-45 Tactical + + + Chiappa Rhino 60DS + Chiappa Rhino 60DS + + + Taurus Judge + Taurus Judge + + + NLAW + NLAW + + + RPG-32 + RPG-32 + + + Mini-Spike (AA) + Mini-Spike (AA) + + + Mini-Spike (AT) + Mini-Spike (AT) + + + MX + MX + + + MX (Black) + MX (Black) + + + MXC + MXC + + + MXC (Black) + MXC (Black) + + + MX 3GL + MX 3GL + + + MX 3GL (Black) + MX 3GL (Black) + + + MX LSW + MX LSW + + + MX LSW (Black) + MX LSW (Black) + + + MXM + MXM + + + MXM (Black) + MXM (Black) + + + KT2002 Katiba + KT2002 Katiba + + + KT2002C Katiba + KT2002C Katiba + + + KT2002 Katiba KGL + KT2002 Katiba KGL + + + F2000 (Camo) + F2000 (Camo) + + + F2000 + F2000 + + + F2000 Tactical (Camo) + F2000 Tactical (Camo) + + + F2000 Tactical + F2000 Tactical + + + F2000 EGLM (Camo) + F2000 EGLM (Camo) + + + F2000 EGLM + F2000 EGLM + + + TAR-21 + TAR-21 + + + CTAR-21 + CTAR-21 + + + TAR-21 EGLM + TAR-21 EGLM + + + Vector SMG + Vector SMG + + + Scorpion Evo 3 A1 + Scorpion Evo 3 A1 + + + CPW + CPW + + + RFB SDAR + RFB SDAR + + + Stoner 99 LMG + Stoner 99 LMG + + + Negev NG7 + Negev NG7 + + + Mk14 Mod 1 EBR + Mk14 Mod 1 EBR + + + GM6 Lynx + GM6 Lynx + + + GM6 Lynx (Camo) + GM6 Lynx (Camo) + + + M200 Intervention + M200 Intervention + + + M200 Intervention (Camo) + M200 Intervention (Camo) + + + VS-121 + VS-121 + \ No newline at end of file diff --git a/addons/thermals/$PBOPREFIX$ b/addons/thermals/$PBOPREFIX$ new file mode 100644 index 0000000000..948bb1dd49 --- /dev/null +++ b/addons/thermals/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\thermals \ No newline at end of file diff --git a/TO_MERGE/agm/Thermals/config.cpp b/addons/thermals/config.cpp similarity index 95% rename from TO_MERGE/agm/Thermals/config.cpp rename to addons/thermals/config.cpp index 044e17c838..fdb00bb0f9 100644 --- a/TO_MERGE/agm/Thermals/config.cpp +++ b/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}; diff --git a/addons/thermals/script_component.hpp b/addons/thermals/script_component.hpp new file mode 100644 index 0000000000..5daf18e62d --- /dev/null +++ b/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" \ No newline at end of file diff --git a/addons/wep_dragon/$PBOPREFIX$ b/addons/wep_dragon/$PBOPREFIX$ index 11c855b566..4275fbd056 100644 --- a/addons/wep_dragon/$PBOPREFIX$ +++ b/addons/wep_dragon/$PBOPREFIX$ @@ -1 +1 @@ -z\ace\Addons\wep_dragon \ No newline at end of file +z\ace\addons\wep_dragon \ No newline at end of file diff --git a/addons/wep_javelin/$PBOPREFIX$ b/addons/wep_javelin/$PBOPREFIX$ index 9c5e79f2a1..311c0dad43 100644 --- a/addons/wep_javelin/$PBOPREFIX$ +++ b/addons/wep_javelin/$PBOPREFIX$ @@ -1 +1 @@ -z\ace\Addons\wep_javelin \ No newline at end of file +z\ace\addons\wep_javelin \ No newline at end of file diff --git a/extras/blank_module/CfgEventHandlers.hpp b/extras/blank_module/CfgEventHandlers.hpp new file mode 100644 index 0000000000..8af0265fe2 --- /dev/null +++ b/extras/blank_module/CfgEventHandlers.hpp @@ -0,0 +1,5 @@ +class Extended_PreInit_EventHandlers { + class ADDON { + init = QUOTE( call compile preprocessFileLineNumbers PATHTOF(XEH_preInit.sqf) ); + }; +}; \ No newline at end of file diff --git a/extras/blank_module/XEH_preInit.sqf b/extras/blank_module/XEH_preInit.sqf new file mode 100644 index 0000000000..a515eb4187 --- /dev/null +++ b/extras/blank_module/XEH_preInit.sqf @@ -0,0 +1,3 @@ +#include "script_component.hpp" + +PREP(empty); \ No newline at end of file diff --git a/extras/blank_module/config.cpp b/extras/blank_module/config.cpp new file mode 100644 index 0000000000..628865c703 --- /dev/null +++ b/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" \ No newline at end of file diff --git a/extras/blank_module/functions/fnc_empty.sqf b/extras/blank_module/functions/fnc_empty.sqf new file mode 100644 index 0000000000..028fb068c9 --- /dev/null +++ b/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!!!"]; \ No newline at end of file diff --git a/extras/blank_module/script_component.hpp b/extras/blank_module/script_component.hpp new file mode 100644 index 0000000000..40058509c2 --- /dev/null +++ b/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" \ No newline at end of file diff --git a/tools/build.bat b/tools/build.bat new file mode 100644 index 0000000000..837aee5490 --- /dev/null +++ b/tools/build.bat @@ -0,0 +1,4 @@ +pushd ..\addons\ +for /D %%i in (*.*) do ( + makepbo -NUP -@=z\addons\ace\%%i %%i ace_%%i.pbo +)