diff --git a/addons/duplicates/$PBOPREFIX$ b/addons/duplicates/$PBOPREFIX$ deleted file mode 100644 index e9ed31f6..00000000 --- a/addons/duplicates/$PBOPREFIX$ +++ /dev/null @@ -1 +0,0 @@ -x\tacgt\addons\duplicates diff --git a/addons/duplicates/CfgAmmo.hpp b/addons/duplicates/CfgAmmo.hpp deleted file mode 100644 index ddb24c07..00000000 --- a/addons/duplicates/CfgAmmo.hpp +++ /dev/null @@ -1,8 +0,0 @@ -class CfgMagazines { - class HandGrenade; - - // M67 Frag Grenade - class CUP_HandGrenade_M67: HandGrenade { - scope = 1; - }; -}; diff --git a/addons/hidden/$PBOPREFIX$ b/addons/hidden/$PBOPREFIX$ new file mode 100644 index 00000000..41c38ca8 --- /dev/null +++ b/addons/hidden/$PBOPREFIX$ @@ -0,0 +1 @@ +x\tacgt\addons\hidden diff --git a/addons/duplicates/CfgWeapons.hpp b/addons/hidden/CfgMagazines.hpp similarity index 59% rename from addons/duplicates/CfgWeapons.hpp rename to addons/hidden/CfgMagazines.hpp index 3f01f1d3..7469f213 100644 --- a/addons/duplicates/CfgWeapons.hpp +++ b/addons/hidden/CfgMagazines.hpp @@ -1,38 +1,36 @@ class CfgMagazines { - class CA_Magazine; - class CUP_TimeBomb_M; + // Thrown Grenades - Perform exactly the same as M67s. + class HandGrenade; + class CUP_HandGrenade_M67: HandGrenade { + scope = 1; + }; + class CUP_HandGrenade_L109A1_HE: CUP_HandGrenade_M67 { + scope = 1; + }; + class CUP_HandGrenade_L109A2_HE: CUP_HandGrenade_M67 { + scope = 1; + }; - // AT-15 Anti-Tank Mine + // Placed Explosives + class CUP_TimeBomb_M; class CUP_Mine_M: CUP_TimeBomb_M { scope = 1; }; - - // TM46 Anti-Tank Mine class CUP_MineE_M: CUP_TimeBomb_M { scope = 1; }; - - // Satchel Charge class CUP_PipeBomb_M: CUP_TimeBomb_M { scope = 1; }; - - // Small IED (Urban) class CUP_IED_V1_M: CUP_Mine_M { scope = 1; }; - - // Large IED (Urban) class CUP_IED_V2_M: CUP_IED_V1_M { scope = 1; }; - - // Small IED (Dug-in) class CUP_IED_V3_M: CUP_IED_V1_M { scope = 1; }; - - // Large IED (Dug-in) class CUP_IED_V4_M: CUP_IED_V1_M { scope = 1; }; diff --git a/addons/hidden/CfgVehicles.hpp b/addons/hidden/CfgVehicles.hpp new file mode 100644 index 00000000..b4b5880d --- /dev/null +++ b/addons/hidden/CfgVehicles.hpp @@ -0,0 +1,54 @@ +class CfgVehicles { + class CUP_supplyCrate_Base; + class CUP_VABox: CUP_supplyCrate_Base { + scope = 1; + }; + class CUP_VABox_GER: CUP_supplyCrate_Base { + scope = 1; + }; + class CUP_VABox_USARMY: CUP_supplyCrate_Base { + scope = 1; + }; + class CUP_VABox_CDF: CUP_supplyCrate_Base { + scope = 1; + }; + class CUP_VABox_GB: CUP_supplyCrate_Base { + scope = 1; + }; + class CUP_VABox_NAPA: CUP_supplyCrate_Base { + scope = 1; + }; + class CUP_VABox_PMC: CUP_supplyCrate_Base { + scope = 1; + }; + class CUP_VABox_RACS: CUP_supplyCrate_Base { + scope = 1; + }; + class CUP_VABox_TK_GUE: CUP_supplyCrate_Base { + scope = 1; + }; + class CUP_VABox_UN: CUP_supplyCrate_Base { + scope = 1; + }; + class CUP_VABox_ChDKZ: CUP_supplyCrate_Base { + scope = 1; + }; + class CUP_VABox_RU: CUP_supplyCrate_Base { + scope = 1; + }; + class CUP_VABox_SLA: CUP_supplyCrate_Base { + scope = 1; + }; + class CUP_VABox_TK: CUP_supplyCrate_Base { + scope = 1; + }; + class CUP_VABox_TKMILITIA: CUP_supplyCrate_Base { + scope = 1; + }; + class CUP_VABox_USMC: CUP_supplyCrate_Base { + scope = 1; + }; + class CUP_VABox_ACR: CUP_supplyCrate_Base { + scope = 1; + }; +}; diff --git a/addons/duplicates/config.cpp b/addons/hidden/config.cpp similarity index 74% rename from addons/duplicates/config.cpp rename to addons/hidden/config.cpp index 6c287a59..1ff18dc3 100644 --- a/addons/duplicates/config.cpp +++ b/addons/hidden/config.cpp @@ -9,8 +9,10 @@ class CfgPatches { requiredVersion = REQUIRED_VERSION; requiredAddons[] = { "tacgt_main", + "CUP_Weapons_AmmoBoxes", "CUP_Weapons_Grenades", - "CUP_Weapons_Put" + "CUP_Weapons_Put", + "CUP_Weapons_ACE_compat" }; author = ECSTRING(main,Authors); authors[] = {"Tyrone"}; @@ -19,5 +21,5 @@ class CfgPatches { }; }; -#include "CfgAmmo.hpp" -#include "CfgWeapons.hpp" +#include "CfgMagazines.hpp" +#include "CfgVehicles.hpp" diff --git a/addons/duplicates/script_component.hpp b/addons/hidden/script_component.hpp similarity index 58% rename from addons/duplicates/script_component.hpp rename to addons/hidden/script_component.hpp index 573653e5..e4977b24 100644 --- a/addons/duplicates/script_component.hpp +++ b/addons/hidden/script_component.hpp @@ -1,4 +1,4 @@ -#define COMPONENT duplicates -#define COMPONENT_BEAUTIFIED Duplicates +#define COMPONENT hidden +#define COMPONENT_BEAUTIFIED Hidden #include "\x\tacgt\addons\main\script_mod.hpp" #include "\x\tacgt\addons\main\script_macros.hpp"