From 99c7bea6fec60e23a0fcabd2a76d2dc00d2e915d Mon Sep 17 00:00:00 2001 From: Grim <69561145+LinkIsGrim@users.noreply.github.com> Date: Tue, 5 Sep 2023 20:33:13 -0400 Subject: [PATCH] Compat GM - Make compat autoload when mod is present (#9364) Co-authored-by: PabstMirror --- {optionals => addons}/compat_gm/$PBOPREFIX$ | 0 .../compat_gm/CfgEventHandlers.hpp | 8 --- addons/compat_gm/CfgMagazines.hpp | 28 ++++++++ .../compat_gm/CfgVehicles.hpp | 71 +------------------ .../compat_gm/CfgWeapons.hpp | 0 {optionals => addons}/compat_gm/XEH_PREP.hpp | 0 .../compat_gm/XEH_preStart.sqf | 0 .../compat_gm/XEH_preinit.sqf | 0 .../compat_gm_explosives}/CfgAmmo.hpp | 12 ++-- .../compat_gm_explosives}/CfgMagazines.hpp | 41 ++--------- .../compat_gm_explosives/CfgVehicles.hpp | 67 +++++++++++++++++ .../compat_gm/compat_gm_explosives/config.cpp | 20 ++++++ .../compat_gm_explosives/script_component.hpp | 5 ++ .../compat_gm_refuel/CfgEventHandlers.hpp | 7 ++ .../compat_gm_refuel/CfgVehicles.hpp | 6 ++ addons/compat_gm/compat_gm_refuel/config.cpp | 19 +++++ .../compat_gm_refuel/script_component.hpp | 5 ++ {optionals => addons}/compat_gm/config.cpp | 4 +- .../compat_gm/functions/fnc_onCut.sqf | 0 .../compat_gm/functions/fnc_onCutRopes.sqf | 0 .../compat_gm/functions/fnc_onDeployRopes.sqf | 0 .../compat_gm/functions/fnc_onPrepare.sqf | 0 .../compat_gm/functions/script_component.hpp | 0 .../compat_gm/script_component.hpp | 2 - 24 files changed, 175 insertions(+), 120 deletions(-) rename {optionals => addons}/compat_gm/$PBOPREFIX$ (100%) rename {optionals => addons}/compat_gm/CfgEventHandlers.hpp (59%) create mode 100644 addons/compat_gm/CfgMagazines.hpp rename {optionals => addons}/compat_gm/CfgVehicles.hpp (83%) rename {optionals => addons}/compat_gm/CfgWeapons.hpp (100%) rename {optionals => addons}/compat_gm/XEH_PREP.hpp (100%) rename {optionals => addons}/compat_gm/XEH_preStart.sqf (100%) rename {optionals => addons}/compat_gm/XEH_preinit.sqf (100%) rename {optionals/compat_gm => addons/compat_gm/compat_gm_explosives}/CfgAmmo.hpp (52%) rename {optionals/compat_gm => addons/compat_gm/compat_gm_explosives}/CfgMagazines.hpp (64%) create mode 100644 addons/compat_gm/compat_gm_explosives/CfgVehicles.hpp create mode 100644 addons/compat_gm/compat_gm_explosives/config.cpp create mode 100644 addons/compat_gm/compat_gm_explosives/script_component.hpp create mode 100644 addons/compat_gm/compat_gm_refuel/CfgEventHandlers.hpp create mode 100644 addons/compat_gm/compat_gm_refuel/CfgVehicles.hpp create mode 100644 addons/compat_gm/compat_gm_refuel/config.cpp create mode 100644 addons/compat_gm/compat_gm_refuel/script_component.hpp rename {optionals => addons}/compat_gm/config.cpp (81%) rename {optionals => addons}/compat_gm/functions/fnc_onCut.sqf (100%) rename {optionals => addons}/compat_gm/functions/fnc_onCutRopes.sqf (100%) rename {optionals => addons}/compat_gm/functions/fnc_onDeployRopes.sqf (100%) rename {optionals => addons}/compat_gm/functions/fnc_onPrepare.sqf (100%) rename {optionals => addons}/compat_gm/functions/script_component.hpp (100%) rename {optionals => addons}/compat_gm/script_component.hpp (74%) diff --git a/optionals/compat_gm/$PBOPREFIX$ b/addons/compat_gm/$PBOPREFIX$ similarity index 100% rename from optionals/compat_gm/$PBOPREFIX$ rename to addons/compat_gm/$PBOPREFIX$ diff --git a/optionals/compat_gm/CfgEventHandlers.hpp b/addons/compat_gm/CfgEventHandlers.hpp similarity index 59% rename from optionals/compat_gm/CfgEventHandlers.hpp rename to addons/compat_gm/CfgEventHandlers.hpp index 2e06ca222b..865276cfba 100644 --- a/optionals/compat_gm/CfgEventHandlers.hpp +++ b/addons/compat_gm/CfgEventHandlers.hpp @@ -9,11 +9,3 @@ class Extended_PreInit_EventHandlers { init = QUOTE(call COMPILE_SCRIPT(XEH_preInit)); }; }; - -class Extended_InitPost_EventHandlers { - class gm_jerrycan { - class ADDON { - init = QUOTE(call EFUNC(refuel,makeJerryCan)); - }; - }; -}; diff --git a/addons/compat_gm/CfgMagazines.hpp b/addons/compat_gm/CfgMagazines.hpp new file mode 100644 index 0000000000..ee5d017275 --- /dev/null +++ b/addons/compat_gm/CfgMagazines.hpp @@ -0,0 +1,28 @@ +class CfgMagazines { + // MG3 + class gm_120rnd_762x51mm_mg3_grn; + class gm_120Rnd_762x51mm_B_T_DM21_mg3_grn: gm_120rnd_762x51mm_mg3_grn { + ACE_isBelt = 1; + }; + class gm_120Rnd_762x51mm_B_T_DM21A1_mg3_grn: gm_120rnd_762x51mm_mg3_grn { + ACE_isBelt = 1; + }; + class gm_120Rnd_762x51mm_B_T_DM21A2_mg3_grn: gm_120rnd_762x51mm_mg3_grn { + ACE_isBelt = 1; + }; + + // PK + class gm_100rnd_762x54mmR_pk_grn; + class gm_100Rnd_762x54mm_API_b32_pk_grn: gm_100rnd_762x54mmR_pk_grn { + ACE_isBelt = 1; + }; + class gm_100Rnd_762x54mm_B_T_t46_pk_grn: gm_100rnd_762x54mmR_pk_grn { + ACE_isBelt = 1; + }; + class gm_100Rnd_762x54mmR_API_7bz3_pk_grn: gm_100rnd_762x54mmR_pk_grn { + ACE_isBelt = 1; + }; + class gm_100Rnd_762x54mmR_B_T_7t2_pk_grn: gm_100rnd_762x54mmR_pk_grn { + ACE_isBelt = 1; + }; +}; diff --git a/optionals/compat_gm/CfgVehicles.hpp b/addons/compat_gm/CfgVehicles.hpp similarity index 83% rename from optionals/compat_gm/CfgVehicles.hpp rename to addons/compat_gm/CfgVehicles.hpp index 61ec9081eb..6d03465cd7 100644 --- a/optionals/compat_gm/CfgVehicles.hpp +++ b/addons/compat_gm/CfgVehicles.hpp @@ -1,72 +1,5 @@ class CfgVehicles { - // EXPLOSIVES - - class Items_base_F; - class ACE_Explosives_Place: Items_base_F { - class ACE_Actions { - class ACE_MainActions; - }; - }; - - // CHARGE - class ACE_Explosives_Place_gm_explosive_petn: ACE_Explosives_Place { - displayName = "PETN Charge"; - model = "gm\gm_weapons\gm_put\gm_explosive_charge_petn"; - class ACE_Actions: ACE_Actions { - class ACE_MainActions: ACE_MainActions { - position = "[-0.002, 0.022, 0.02]"; - }; - }; - }; - class ACE_Explosives_Place_gm_explosive_plnp: ACE_Explosives_Place { - displayName = "PLNP Charge"; - model = "gm\gm_weapons\gm_put\gm_explosive_charge_plnp"; - class ACE_Actions: ACE_Actions { - class ACE_MainActions: ACE_MainActions { - position = "[-0.002, 0.022, 0.02]"; - }; - }; - }; - // AT MINE - class ACE_Explosives_Place_gm_mine_tm46: ACE_Explosives_Place { - displayName = "AT Mine TM46"; - model = "gm\gm_weapons\gm_put\gm_mine_at_tm46"; - class ACE_Actions: ACE_Actions { - class ACE_MainActions: ACE_MainActions { - position = "[-0.002, 0.022, 0.02]"; - }; - }; - }; - class ACE_Explosives_Place_gm_explosive_dm21: ACE_Explosives_Place { - displayName = "AT Mine DM21"; - model = "gm\gm_weapons\gm_put\gm_mine_at_dm21"; - class ACE_Actions: ACE_Actions { - class ACE_MainActions: ACE_MainActions { - position = "[-0.002, 0.022, 0.02]"; - }; - }; - }; - class ACE_Explosives_Place_gm_explosive_m111: ACE_Explosives_Place { - displayName = "MN 111"; - model = "gm\gm_weapons\gm_launchers\gm_platan\gm_mine_at_mn111_disarmed"; - class ACE_Actions: ACE_Actions { - class ACE_MainActions: ACE_MainActions { - position = "[-0.002, 0.022, 0.02]"; - }; - }; - }; - // AP - class ACE_Explosives_Place_gm_explosive_dm31: ACE_Explosives_Place { - displayName = "AP Mine DM31"; - model = "gm\gm_weapons\gm_put\gm_mine_ap_dm31"; - class ACE_Actions: ACE_Actions { - class ACE_MainActions: ACE_MainActions { - position = "[-0.002, 0.022, 0.02]"; - }; - }; - }; - // REPAIR, REFUEL, REARM class ReammoBox_F; @@ -164,7 +97,6 @@ class CfgVehicles { }; class gm_ural4320_refuel_base: gm_ural4320_base { - transportFuel = 0; EGVAR(refuel,hooks)[] = {{-0.05,-3.6,-0.45}}; EGVAR(refuel,fuelCargo) = 10000; }; @@ -308,6 +240,8 @@ class CfgVehicles { EGVAR(medical,medicClass) = 1; }; + // If any hard edits are made, move to an appropriate subcomponent + // fastroping not needed unlike RHS as no hard edits are made here // H E L I C O P T E R S class Helicopter_Base_F; @@ -323,6 +257,7 @@ class CfgVehicles { EGVAR(refuel,fuelCapacity) = 3700; EGVAR(fastroping,enabled) = 0; + // TODO: stringtables class UserActions { class openDoor_L { displayNameDefault = "Open left Door"; diff --git a/optionals/compat_gm/CfgWeapons.hpp b/addons/compat_gm/CfgWeapons.hpp similarity index 100% rename from optionals/compat_gm/CfgWeapons.hpp rename to addons/compat_gm/CfgWeapons.hpp diff --git a/optionals/compat_gm/XEH_PREP.hpp b/addons/compat_gm/XEH_PREP.hpp similarity index 100% rename from optionals/compat_gm/XEH_PREP.hpp rename to addons/compat_gm/XEH_PREP.hpp diff --git a/optionals/compat_gm/XEH_preStart.sqf b/addons/compat_gm/XEH_preStart.sqf similarity index 100% rename from optionals/compat_gm/XEH_preStart.sqf rename to addons/compat_gm/XEH_preStart.sqf diff --git a/optionals/compat_gm/XEH_preinit.sqf b/addons/compat_gm/XEH_preinit.sqf similarity index 100% rename from optionals/compat_gm/XEH_preinit.sqf rename to addons/compat_gm/XEH_preinit.sqf diff --git a/optionals/compat_gm/CfgAmmo.hpp b/addons/compat_gm/compat_gm_explosives/CfgAmmo.hpp similarity index 52% rename from optionals/compat_gm/CfgAmmo.hpp rename to addons/compat_gm/compat_gm_explosives/CfgAmmo.hpp index 30a86758e5..3da49f45ab 100644 --- a/optionals/compat_gm/CfgAmmo.hpp +++ b/addons/compat_gm/compat_gm_explosives/CfgAmmo.hpp @@ -1,25 +1,25 @@ class CfgAmmo { class PipeBombBase; class gm_explosive_petn_charge: PipeBombBase { - EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02}; + EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02}; }; class gm_explosive_plnp_charge: PipeBombBase { - EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02}; + EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02}; }; class gm_mine_at_base; class gm_mine_at_mn111: gm_mine_at_base { - EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02}; + EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02}; }; class gm_mine_at_dm21: gm_mine_at_base { - EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02}; + EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02}; }; class gm_mine_at_tm46: gm_mine_at_base { - EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02}; + EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02}; }; class gm_mine_bounce_base; class gm_mine_ap_dm31: gm_mine_bounce_base { - EGVAR(explosive,defuseObjectPosition)[] = {0, 0, 0.02}; + EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02}; }; }; diff --git a/optionals/compat_gm/CfgMagazines.hpp b/addons/compat_gm/compat_gm_explosives/CfgMagazines.hpp similarity index 64% rename from optionals/compat_gm/CfgMagazines.hpp rename to addons/compat_gm/compat_gm_explosives/CfgMagazines.hpp index b439c1ecaa..17d51d3b45 100644 --- a/optionals/compat_gm/CfgMagazines.hpp +++ b/addons/compat_gm/compat_gm_explosives/CfgMagazines.hpp @@ -1,37 +1,10 @@ -class cfgMagazines { - // MG3 - class gm_120rnd_762x51mm_mg3_grn; - class gm_120Rnd_762x51mm_B_T_DM21_mg3_grn: gm_120rnd_762x51mm_mg3_grn { - ACE_isBelt = 1; - }; - class gm_120Rnd_762x51mm_B_T_DM21A1_mg3_grn: gm_120rnd_762x51mm_mg3_grn { - ACE_isBelt = 1; - }; - class gm_120Rnd_762x51mm_B_T_DM21A2_mg3_grn: gm_120rnd_762x51mm_mg3_grn { - ACE_isBelt = 1; - }; - - // PK - class gm_100rnd_762x54mmR_pk_grn; - class gm_100Rnd_762x54mm_API_b32_pk_grn: gm_100rnd_762x54mmR_pk_grn { - ACE_isBelt = 1; - }; - class gm_100Rnd_762x54mm_B_T_t46_pk_grn: gm_100rnd_762x54mmR_pk_grn { - ACE_isBelt = 1; - }; - class gm_100Rnd_762x54mmR_API_7bz3_pk_grn: gm_100rnd_762x54mmR_pk_grn { - ACE_isBelt = 1; - }; - class gm_100Rnd_762x54mmR_B_T_7t2_pk_grn: gm_100rnd_762x54mmR_pk_grn { - ACE_isBelt = 1; - }; - +class CfgMagazines { // Explosives class gm_explosive_petn_charge_base; class gm_explosive_petn_charge: gm_explosive_petn_charge_base { EGVAR(explosives,DelayTime) = 1; EGVAR(explosives,Placeable) = 1; - EGVAR(explosives,SetupObject) = "ACE_Explosives_Place_gm_explosive_petn"; + EGVAR(explosives,SetupObject) =QEGVAR(explosives,Place_gm_explosive_petn); useAction = 0; class ACE_Triggers { SupportedTriggers[] = {"Timer", "Command", "MK16_Transmitter", "DeadmanSwitch"}; @@ -50,7 +23,7 @@ class cfgMagazines { class gm_explosive_plnp_charge: gm_explosive_plnp_charge_base { EGVAR(explosives,DelayTime) = 1; EGVAR(explosives,Placeable) = 1; - EGVAR(explosives,SetupObject) = "ACE_Explosives_Place_gm_explosive_plnp"; + EGVAR(explosives,SetupObject) =QEGVAR(explosives,Place_gm_explosive_plnp); useAction = 0; class ACE_Triggers { SupportedTriggers[] = {"Timer", "Command", "MK16_Transmitter", "DeadmanSwitch"}; @@ -68,7 +41,7 @@ class cfgMagazines { class gm_mine_at_base; class gm_mine_at_tm46: gm_mine_at_base { EGVAR(explosives,Placeable) = 1; - EGVAR(explosives,SetupObject) = "ACE_Explosives_Place_gm_mine_tm46"; + EGVAR(explosives,SetupObject) =QEGVAR(explosives,Place_gm_mine_tm46); useAction = 0; class ACE_Triggers { SupportedTriggers[] = {"PressurePlate"}; @@ -79,7 +52,7 @@ class cfgMagazines { }; class gm_mine_at_dm21: gm_mine_at_base { EGVAR(explosives,Placeable) = 1; - EGVAR(explosives,SetupObject) = "ACE_Explosives_Place_gm_explosive_dm21"; + EGVAR(explosives,SetupObject) =QEGVAR(explosives,Place_gm_explosive_dm21); useAction = 0; class ACE_Triggers { SupportedTriggers[] = {"PressurePlate"}; @@ -90,7 +63,7 @@ class cfgMagazines { }; class gm_mine_at_mn111: gm_mine_at_base { EGVAR(explosives,Placeable) = 1; - EGVAR(explosives,SetupObject) = "ACE_Explosives_Place_gm_explosive_m111"; + EGVAR(explosives,SetupObject) =QEGVAR(explosives,Place_gm_explosive_m111); useAction = 0; class ACE_Triggers { SupportedTriggers[] = {"PressurePlate"}; @@ -102,7 +75,7 @@ class cfgMagazines { class gm_mine_ap_dm31: gm_mine_at_base { EGVAR(explosives,Placeable) = 1; - EGVAR(explosives,SetupObject) = "ACE_Explosives_Place_gm_explosive_dm31"; + EGVAR(explosives,SetupObject) =QEGVAR(explosives,Place_gm_explosive_dm31); useAction = 0; class ACE_Triggers { SupportedTriggers[] = {"Tripwire"}; diff --git a/addons/compat_gm/compat_gm_explosives/CfgVehicles.hpp b/addons/compat_gm/compat_gm_explosives/CfgVehicles.hpp new file mode 100644 index 0000000000..bb279c82b9 --- /dev/null +++ b/addons/compat_gm/compat_gm_explosives/CfgVehicles.hpp @@ -0,0 +1,67 @@ +class CfgVehicles { + + class Items_base_F; + class EGVAR(explosives,Place): Items_base_F { + class ACE_Actions { + class ACE_MainActions; + }; + }; + + // CHARGE + class EGVAR(explosives,Place_gm_explosive_petn): EGVAR(explosives,Place) { + displayName = "PETN Charge"; + model = "gm\gm_weapons\gm_put\gm_explosive_charge_petn"; + class ACE_Actions: ACE_Actions { + class ACE_MainActions: ACE_MainActions { + position = "[-0.002, 0.022, 0.02]"; + }; + }; + }; + class EGVAR(explosives,Place_gm_explosive_plnp): EGVAR(explosives,Place) { + displayName = "PLNP Charge"; + model = "gm\gm_weapons\gm_put\gm_explosive_charge_plnp"; + class ACE_Actions: ACE_Actions { + class ACE_MainActions: ACE_MainActions { + position = "[-0.002, 0.022, 0.02]"; + }; + }; + }; + // AT MINE + class EGVAR(explosives,Place_gm_mine_tm46): EGVAR(explosives,Place) { + displayName = "AT Mine TM46"; + model = "gm\gm_weapons\gm_put\gm_mine_at_tm46"; + class ACE_Actions: ACE_Actions { + class ACE_MainActions: ACE_MainActions { + position = "[-0.002, 0.022, 0.02]"; + }; + }; + }; + class EGVAR(explosives,Place_gm_explosive_dm21): EGVAR(explosives,Place) { + displayName = "AT Mine DM21"; + model = "gm\gm_weapons\gm_put\gm_mine_at_dm21"; + class ACE_Actions: ACE_Actions { + class ACE_MainActions: ACE_MainActions { + position = "[-0.002, 0.022, 0.02]"; + }; + }; + }; + class EGVAR(explosives,Place_gm_explosive_m111): EGVAR(explosives,Place) { + displayName = "MN 111"; + model = "gm\gm_weapons\gm_launchers\gm_platan\gm_mine_at_mn111_disarmed"; + class ACE_Actions: ACE_Actions { + class ACE_MainActions: ACE_MainActions { + position = "[-0.002, 0.022, 0.02]"; + }; + }; + }; + // AP + class EGVAR(explosives,Place_gm_explosive_dm31): EGVAR(explosives,Place) { + displayName = "AP Mine DM31"; + model = "gm\gm_weapons\gm_put\gm_mine_ap_dm31"; + class ACE_Actions: ACE_Actions { + class ACE_MainActions: ACE_MainActions { + position = "[-0.002, 0.022, 0.02]"; + }; + }; + }; +}; diff --git a/addons/compat_gm/compat_gm_explosives/config.cpp b/addons/compat_gm/compat_gm_explosives/config.cpp new file mode 100644 index 0000000000..aa3de76d41 --- /dev/null +++ b/addons/compat_gm/compat_gm_explosives/config.cpp @@ -0,0 +1,20 @@ +#include "script_component.hpp" + +class CfgPatches { + class ADDON { + addonRootClass = QUOTE(COMPONENT); + units[] = {}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = { + "gm_core", + "ace_explosives" + }; + skipWhenMissingDependencies = 1; + VERSION_CONFIG; + }; +}; + +#include "CfgAmmo.hpp" +#include "CfgMagazines.hpp" +#include "CfgVehicles.hpp" diff --git a/addons/compat_gm/compat_gm_explosives/script_component.hpp b/addons/compat_gm/compat_gm_explosives/script_component.hpp new file mode 100644 index 0000000000..f2c819d89e --- /dev/null +++ b/addons/compat_gm/compat_gm_explosives/script_component.hpp @@ -0,0 +1,5 @@ +#include "\z\ace\addons\compat_gm\script_component.hpp" + +#define SUBCOMPONENT explosives +#undef ADDON +#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT) diff --git a/addons/compat_gm/compat_gm_refuel/CfgEventHandlers.hpp b/addons/compat_gm/compat_gm_refuel/CfgEventHandlers.hpp new file mode 100644 index 0000000000..81ef39f88d --- /dev/null +++ b/addons/compat_gm/compat_gm_refuel/CfgEventHandlers.hpp @@ -0,0 +1,7 @@ +class Extended_InitPost_EventHandlers { + class gm_jerrycan { + class ADDON { + init = QUOTE(call EFUNC(refuel,makeJerryCan)); + }; + }; +}; diff --git a/addons/compat_gm/compat_gm_refuel/CfgVehicles.hpp b/addons/compat_gm/compat_gm_refuel/CfgVehicles.hpp new file mode 100644 index 0000000000..46a4deeefd --- /dev/null +++ b/addons/compat_gm/compat_gm_refuel/CfgVehicles.hpp @@ -0,0 +1,6 @@ +class CfgVehicles { + class gm_ural4320_base; + class gm_ural4320_refuel_base: gm_ural4320_base { + transportFuel = 0; + }; +}; diff --git a/addons/compat_gm/compat_gm_refuel/config.cpp b/addons/compat_gm/compat_gm_refuel/config.cpp new file mode 100644 index 0000000000..9f367e99f9 --- /dev/null +++ b/addons/compat_gm/compat_gm_refuel/config.cpp @@ -0,0 +1,19 @@ +#include "script_component.hpp" + +class CfgPatches { + class ADDON { + addonRootClass = QUOTE(COMPONENT); + units[] = {}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = { + "gm_core", + "ace_refuel" + }; + skipWhenMissingDependencies = 1; + VERSION_CONFIG; + }; +}; + +#include "CfgEventHandlers.hpp" +#include "CfgVehicles.hpp" diff --git a/addons/compat_gm/compat_gm_refuel/script_component.hpp b/addons/compat_gm/compat_gm_refuel/script_component.hpp new file mode 100644 index 0000000000..e5a1095957 --- /dev/null +++ b/addons/compat_gm/compat_gm_refuel/script_component.hpp @@ -0,0 +1,5 @@ +#include "\z\ace\addons\compat_gm\script_component.hpp" + +#define SUBCOMPONENT refuel +#undef ADDON +#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT) diff --git a/optionals/compat_gm/config.cpp b/addons/compat_gm/config.cpp similarity index 81% rename from optionals/compat_gm/config.cpp rename to addons/compat_gm/config.cpp index 4e1883a641..63f43635d5 100644 --- a/optionals/compat_gm/config.cpp +++ b/addons/compat_gm/config.cpp @@ -6,7 +6,8 @@ class CfgPatches { units[] = {}; weapons[] = {}; requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {"ace_csw", "ace_explosives", "ace_refuel", "gm_core"}; + requiredAddons[] = {"ace_common", "gm_core"}; + skipWhenMissingDependencies = 1; author = ECSTRING(common,ACETeam); authors[] = {"sancron", "nomisum"}; url = ECSTRING(main,URL); @@ -14,7 +15,6 @@ class CfgPatches { }; }; -#include "CfgAmmo.hpp" #include "CfgEventHandlers.hpp" #include "CfgMagazines.hpp" #include "CfgWeapons.hpp" diff --git a/optionals/compat_gm/functions/fnc_onCut.sqf b/addons/compat_gm/functions/fnc_onCut.sqf similarity index 100% rename from optionals/compat_gm/functions/fnc_onCut.sqf rename to addons/compat_gm/functions/fnc_onCut.sqf diff --git a/optionals/compat_gm/functions/fnc_onCutRopes.sqf b/addons/compat_gm/functions/fnc_onCutRopes.sqf similarity index 100% rename from optionals/compat_gm/functions/fnc_onCutRopes.sqf rename to addons/compat_gm/functions/fnc_onCutRopes.sqf diff --git a/optionals/compat_gm/functions/fnc_onDeployRopes.sqf b/addons/compat_gm/functions/fnc_onDeployRopes.sqf similarity index 100% rename from optionals/compat_gm/functions/fnc_onDeployRopes.sqf rename to addons/compat_gm/functions/fnc_onDeployRopes.sqf diff --git a/optionals/compat_gm/functions/fnc_onPrepare.sqf b/addons/compat_gm/functions/fnc_onPrepare.sqf similarity index 100% rename from optionals/compat_gm/functions/fnc_onPrepare.sqf rename to addons/compat_gm/functions/fnc_onPrepare.sqf diff --git a/optionals/compat_gm/functions/script_component.hpp b/addons/compat_gm/functions/script_component.hpp similarity index 100% rename from optionals/compat_gm/functions/script_component.hpp rename to addons/compat_gm/functions/script_component.hpp diff --git a/optionals/compat_gm/script_component.hpp b/addons/compat_gm/script_component.hpp similarity index 74% rename from optionals/compat_gm/script_component.hpp rename to addons/compat_gm/script_component.hpp index 1d5854d451..6b044b1192 100644 --- a/optionals/compat_gm/script_component.hpp +++ b/addons/compat_gm/script_component.hpp @@ -3,5 +3,3 @@ #include "\z\ace\addons\main\script_mod.hpp" #include "\z\ace\addons\main\script_macros.hpp" - -#include "\z\ace\addons\csw\script_config_macros_csw.hpp"