From 6c34126a91b3c8bfab7781d6bf489172891bdeb7 Mon Sep 17 00:00:00 2001 From: Andreas Brostrom Date: Thu, 24 Sep 2020 19:41:34 +0200 Subject: [PATCH 1/2] Added items --- addons/items/$PBOPREFIX$ | 1 + addons/items/CfgEventHandlers.hpp | 10 ++++ addons/items/CfgMagazines.hpp | 93 +++++++++++++++++++++++++++++++ addons/items/README.md | 4 ++ addons/items/XEH_PREP.hpp | 0 addons/items/XEH_preInit.sqf | 9 +++ addons/items/XEH_preStart.sqf | 3 + addons/items/config.cpp | 18 ++++++ addons/items/script_component.hpp | 17 ++++++ addons/items/stringtable.xml | 5 ++ 10 files changed, 160 insertions(+) create mode 100644 addons/items/$PBOPREFIX$ create mode 100644 addons/items/CfgEventHandlers.hpp create mode 100644 addons/items/CfgMagazines.hpp create mode 100644 addons/items/README.md create mode 100644 addons/items/XEH_PREP.hpp create mode 100644 addons/items/XEH_preInit.sqf create mode 100644 addons/items/XEH_preStart.sqf create mode 100644 addons/items/config.cpp create mode 100644 addons/items/script_component.hpp create mode 100644 addons/items/stringtable.xml diff --git a/addons/items/$PBOPREFIX$ b/addons/items/$PBOPREFIX$ new file mode 100644 index 00000000..e918a485 --- /dev/null +++ b/addons/items/$PBOPREFIX$ @@ -0,0 +1 @@ +z\acex\addons\items diff --git a/addons/items/CfgEventHandlers.hpp b/addons/items/CfgEventHandlers.hpp new file mode 100644 index 00000000..e67698a1 --- /dev/null +++ b/addons/items/CfgEventHandlers.hpp @@ -0,0 +1,10 @@ +class Extended_PreStart_EventHandlers { + class ADDON { + init = QUOTE(call COMPILE_FILE(XEH_preStart)); + }; +}; +class Extended_PreInit_EventHandlers { + class ADDON { + init = QUOTE(call COMPILE_FILE(XEH_preInit)); + }; +}; diff --git a/addons/items/CfgMagazines.hpp b/addons/items/CfgMagazines.hpp new file mode 100644 index 00000000..5c818e1a --- /dev/null +++ b/addons/items/CfgMagazines.hpp @@ -0,0 +1,93 @@ +class CfgMagazines { + class OM_Magazine; + class Antibiotic : OM_Magazine { + scope = 2; + }; + class Antimalaricum : OM_Magazine { + scope = 2; + }; + class AntimalaricumVaccine : OM_Magazine { + scope = 2; + }; + class Bandage : OM_Magazine { + scope = 2; + }; + class Files : OM_Magazine { + scope = 2; + }; + class Files_diary : Files { + scope = 2; + }; + class Files_researchNotes : Files { + scope = 2; + }; + class FilesSecret : Files { + scope = 2; + }; + class DocumentsSecret : Files { + scope = 2; + }; + class Wallet_ID : Files { + scope = 2; + }; + class Keys : Files { + scope = 2; + }; + class Csat_Id_01 : Files { + scope = 2; + }; + class Csat_Id_02 : Files { + scope = 2; + }; + class Csat_Id_03 : Files { + scope = 2; + }; + class Csat_Id_04 : Files { + scope = 2; + }; + class Csat_Id_05 : Files { + scope = 2; + }; + class FileTopSecret : OM_Magazine { + scope = 2; + }; + class FileNetworkStructure : OM_Magazine { + scope = 2; + }; + class Laptop_Unfolded : OM_Magazine { + scope = 2; + }; + class Laptop_Closed : OM_Magazine { + scope = 2; + }; + class SatPhone : OM_Magazine { + scope = 2; + }; + class MobilePhone : OM_Magazine { + scope = 2; + }; + class SmartPhone : MobilePhone { + scope = 2; + }; + class FlashDisk : MobilePhone { + scope = 2; + }; + class ButaneCanister : OM_Magazine { + scope = 2; + }; + class Money : OM_Magazine { + scope = 2; + }; + class Money_bunch : Money { + scope = 2; + }; + class Money_roll : Money { + scope = 2; + }; + class Money_stack : Money { + scope = 2; + }; + class Sleeping_bag_folded_01 : OM_Magazine { + scope = 2; + }; +}; diff --git a/addons/items/README.md b/addons/items/README.md new file mode 100644 index 00000000..147105cb --- /dev/null +++ b/addons/items/README.md @@ -0,0 +1,4 @@ +acex_items +=============== + +Adds all vanilla inventory introduced in old man dlc item to be obtainable in arsenal \ No newline at end of file diff --git a/addons/items/XEH_PREP.hpp b/addons/items/XEH_PREP.hpp new file mode 100644 index 00000000..e69de29b diff --git a/addons/items/XEH_preInit.sqf b/addons/items/XEH_preInit.sqf new file mode 100644 index 00000000..b47cf662 --- /dev/null +++ b/addons/items/XEH_preInit.sqf @@ -0,0 +1,9 @@ +#include "script_component.hpp" + +ADDON = false; + +PREP_RECOMPILE_START; +#include "XEH_PREP.hpp" +PREP_RECOMPILE_END; + +ADDON = true; diff --git a/addons/items/XEH_preStart.sqf b/addons/items/XEH_preStart.sqf new file mode 100644 index 00000000..02288857 --- /dev/null +++ b/addons/items/XEH_preStart.sqf @@ -0,0 +1,3 @@ +#include "script_component.hpp" + +#include "XEH_PREP.hpp" diff --git a/addons/items/config.cpp b/addons/items/config.cpp new file mode 100644 index 00000000..97d26a20 --- /dev/null +++ b/addons/items/config.cpp @@ -0,0 +1,18 @@ +#include "script_component.hpp" + +class CfgPatches { + class ADDON { + name = COMPONENT_NAME; + units[] = {}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {}; + author = ACECSTRING(common,ACETeam); + authors[] = {"Brostrom.A Evul"}; + url = ACECSTRING(main,URL); + VERSION_CONFIG; + }; +}; + +#include "CfgEventHandlers.hpp" +#include "CfgMagazines.hpp" diff --git a/addons/items/script_component.hpp b/addons/items/script_component.hpp new file mode 100644 index 00000000..663d036e --- /dev/null +++ b/addons/items/script_component.hpp @@ -0,0 +1,17 @@ +#define COMPONENT items +#define COMPONENT_BEAUTIFIED Items +#include "\z\acex\addons\main\script_mod.hpp" + +// #define DEBUG_MODE_FULL +// #define DISABLE_COMPILE_CACHE +// #define ENABLE_PERFORMANCE_COUNTERS + +#ifdef DEBUG_ENABLED_items + #define DEBUG_MODE_FULL +#endif + +#ifdef DEBUG_SETTINGS_items + #define DEBUG_SETTINGS DEBUG_SETTINGS_items +#endif + +#include "\z\acex\addons\main\script_macros.hpp" \ No newline at end of file diff --git a/addons/items/stringtable.xml b/addons/items/stringtable.xml new file mode 100644 index 00000000..9f4314a5 --- /dev/null +++ b/addons/items/stringtable.xml @@ -0,0 +1,5 @@ + + + + + From f8cced1fc995adb024e049c519b9d52cd5bdc88d Mon Sep 17 00:00:00 2001 From: Andreas Brostrom Date: Thu, 24 Sep 2020 19:53:43 +0200 Subject: [PATCH 2/2] Removed empty stringtable --- addons/items/stringtable.xml | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 addons/items/stringtable.xml diff --git a/addons/items/stringtable.xml b/addons/items/stringtable.xml deleted file mode 100644 index 9f4314a5..00000000 --- a/addons/items/stringtable.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - -