From 10ffcea9b7872dcfb0ceab64832e50f8add2a7c7 Mon Sep 17 00:00:00 2001 From: Dystopian Date: Mon, 4 Sep 2023 04:56:54 +0300 Subject: [PATCH] Optionals - Add No Medical and No Realistic Names components (#8187) * Add nomedical and norealisticnames components * Add fire component disabling * Make it work * remove headlight skipping * update preprocess syntax * fix git screwup * Apply suggestions from code review --------- Co-authored-by: LinkIsGrim Co-authored-by: jonpas --- addons/fire/addon.toml | 2 ++ addons/fire/config.cpp | 9 +++++++++ addons/medical/addon.toml | 2 ++ addons/medical/config.cpp | 9 +++++++++ addons/medical_ai/addon.toml | 2 ++ addons/medical_ai/config.cpp | 9 +++++++++ addons/medical_blood/addon.toml | 2 ++ addons/medical_blood/config.cpp | 9 +++++++++ addons/medical_damage/addon.toml | 2 ++ addons/medical_damage/config.cpp | 9 +++++++++ addons/medical_engine/addon.toml | 2 ++ addons/medical_engine/config.cpp | 9 +++++++++ addons/medical_feedback/addon.toml | 2 ++ addons/medical_feedback/config.cpp | 9 +++++++++ addons/medical_gui/addon.toml | 2 ++ addons/medical_gui/config.cpp | 9 +++++++++ addons/medical_statemachine/addon.toml | 2 ++ addons/medical_statemachine/config.cpp | 9 +++++++++ addons/medical_status/addon.toml | 2 ++ addons/medical_status/config.cpp | 9 +++++++++ addons/medical_treatment/addon.toml | 2 ++ addons/medical_treatment/config.cpp | 9 +++++++++ addons/medical_vitals/addon.toml | 2 ++ addons/medical_vitals/config.cpp | 9 +++++++++ addons/realisticnames/addon.toml | 2 ++ addons/realisticnames/config.cpp | 9 +++++++++ optionals/nomedical/$PBOPREFIX$ | 1 + optionals/nomedical/config.cpp | 15 +++++++++++++++ optionals/nomedical/script_component.hpp | 6 ++++++ optionals/norealisticnames/$PBOPREFIX$ | 1 + optionals/norealisticnames/config.cpp | 15 +++++++++++++++ optionals/norealisticnames/script_component.hpp | 6 ++++++ 32 files changed, 187 insertions(+) create mode 100644 addons/fire/addon.toml create mode 100644 addons/medical/addon.toml create mode 100644 addons/medical_ai/addon.toml create mode 100644 addons/medical_blood/addon.toml create mode 100644 addons/medical_damage/addon.toml create mode 100644 addons/medical_engine/addon.toml create mode 100644 addons/medical_feedback/addon.toml create mode 100644 addons/medical_gui/addon.toml create mode 100644 addons/medical_statemachine/addon.toml create mode 100644 addons/medical_status/addon.toml create mode 100644 addons/medical_treatment/addon.toml create mode 100644 addons/medical_vitals/addon.toml create mode 100644 addons/realisticnames/addon.toml create mode 100644 optionals/nomedical/$PBOPREFIX$ create mode 100644 optionals/nomedical/config.cpp create mode 100644 optionals/nomedical/script_component.hpp create mode 100644 optionals/norealisticnames/$PBOPREFIX$ create mode 100644 optionals/norealisticnames/config.cpp create mode 100644 optionals/norealisticnames/script_component.hpp diff --git a/addons/fire/addon.toml b/addons/fire/addon.toml new file mode 100644 index 0000000000..7cfef775ee --- /dev/null +++ b/addons/fire/addon.toml @@ -0,0 +1,2 @@ +[preprocess] +enabled = false diff --git a/addons/fire/config.cpp b/addons/fire/config.cpp index f2392f9797..ac9f7009ec 100644 --- a/addons/fire/config.cpp +++ b/addons/fire/config.cpp @@ -1,5 +1,12 @@ #include "script_component.hpp" +#if __has_include("\z\ace\addons\nomedical\script_component.hpp") +#define PATCH_SKIP "No Medical" +#endif + +#ifdef PATCH_SKIP +ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) +#else class CfgPatches { class ADDON { name = COMPONENT_NAME; @@ -18,3 +25,5 @@ class CfgPatches { #include "CfgSounds.hpp" #include "ACE_Medical_Treatment_Actions.hpp" #include "RscTitles.hpp" + +#endif diff --git a/addons/medical/addon.toml b/addons/medical/addon.toml new file mode 100644 index 0000000000..7cfef775ee --- /dev/null +++ b/addons/medical/addon.toml @@ -0,0 +1,2 @@ +[preprocess] +enabled = false diff --git a/addons/medical/config.cpp b/addons/medical/config.cpp index 6c93d1e3e8..76e9818124 100644 --- a/addons/medical/config.cpp +++ b/addons/medical/config.cpp @@ -1,5 +1,12 @@ #include "script_component.hpp" +#if __has_include("\z\ace\addons\nomedical\script_component.hpp") +#define PATCH_SKIP "No Medical" +#endif + +#ifdef PATCH_SKIP +ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) +#else class CfgPatches { class ADDON { name = COMPONENT_NAME; @@ -21,3 +28,5 @@ class CfgPatches { class ACE_Tests { medicalHitpoints = QPATHTOF(dev\test_hitpointConfigs.sqf); }; + +#endif diff --git a/addons/medical_ai/addon.toml b/addons/medical_ai/addon.toml new file mode 100644 index 0000000000..7cfef775ee --- /dev/null +++ b/addons/medical_ai/addon.toml @@ -0,0 +1,2 @@ +[preprocess] +enabled = false diff --git a/addons/medical_ai/config.cpp b/addons/medical_ai/config.cpp index c42fc98f95..b9fb4386ad 100644 --- a/addons/medical_ai/config.cpp +++ b/addons/medical_ai/config.cpp @@ -1,5 +1,12 @@ #include "script_component.hpp" +#if __has_include("\z\ace\addons\nomedical\script_component.hpp") +#define PATCH_SKIP "No Medical" +#endif + +#ifdef PATCH_SKIP +ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) +#else class CfgPatches { class ADDON { name = COMPONENT_NAME; @@ -16,3 +23,5 @@ class CfgPatches { #include "ACE_Settings.hpp" #include "CfgEventHandlers.hpp" + +#endif diff --git a/addons/medical_blood/addon.toml b/addons/medical_blood/addon.toml new file mode 100644 index 0000000000..7cfef775ee --- /dev/null +++ b/addons/medical_blood/addon.toml @@ -0,0 +1,2 @@ +[preprocess] +enabled = false diff --git a/addons/medical_blood/config.cpp b/addons/medical_blood/config.cpp index 3e5d5227da..c10bd80ee0 100644 --- a/addons/medical_blood/config.cpp +++ b/addons/medical_blood/config.cpp @@ -1,5 +1,12 @@ #include "script_component.hpp" +#if __has_include("\z\ace\addons\nomedical\script_component.hpp") +#define PATCH_SKIP "No Medical" +#endif + +#ifdef PATCH_SKIP +ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) +#else class CfgPatches { class ADDON { name = COMPONENT_NAME; @@ -16,3 +23,5 @@ class CfgPatches { #include "CfgEventHandlers.hpp" #include "ACE_Settings.hpp" + +#endif diff --git a/addons/medical_damage/addon.toml b/addons/medical_damage/addon.toml new file mode 100644 index 0000000000..7cfef775ee --- /dev/null +++ b/addons/medical_damage/addon.toml @@ -0,0 +1,2 @@ +[preprocess] +enabled = false diff --git a/addons/medical_damage/config.cpp b/addons/medical_damage/config.cpp index 5edaa691b3..712ec44a01 100644 --- a/addons/medical_damage/config.cpp +++ b/addons/medical_damage/config.cpp @@ -1,5 +1,12 @@ #include "script_component.hpp" +#if __has_include("\z\ace\addons\nomedical\script_component.hpp") +#define PATCH_SKIP "No Medical" +#endif + +#ifdef PATCH_SKIP +ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) +#else class CfgPatches { class ADDON { name = COMPONENT_NAME; @@ -27,3 +34,5 @@ class ACE_Extensions { }; }; */ + +#endif diff --git a/addons/medical_engine/addon.toml b/addons/medical_engine/addon.toml new file mode 100644 index 0000000000..7cfef775ee --- /dev/null +++ b/addons/medical_engine/addon.toml @@ -0,0 +1,2 @@ +[preprocess] +enabled = false diff --git a/addons/medical_engine/config.cpp b/addons/medical_engine/config.cpp index be5dc54040..8d718155d1 100644 --- a/addons/medical_engine/config.cpp +++ b/addons/medical_engine/config.cpp @@ -1,5 +1,12 @@ #include "script_component.hpp" +#if __has_include("\z\ace\addons\nomedical\script_component.hpp") +#define PATCH_SKIP "No Medical" +#endif + +#ifdef PATCH_SKIP +ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) +#else class CfgPatches { class ADDON { name = COMPONENT_NAME; @@ -21,3 +28,5 @@ class CfgPatches { #include "CfgMoves.hpp" #include "CfgVehicles.hpp" #include "CfgWeapons.hpp" + +#endif diff --git a/addons/medical_feedback/addon.toml b/addons/medical_feedback/addon.toml new file mode 100644 index 0000000000..7cfef775ee --- /dev/null +++ b/addons/medical_feedback/addon.toml @@ -0,0 +1,2 @@ +[preprocess] +enabled = false diff --git a/addons/medical_feedback/config.cpp b/addons/medical_feedback/config.cpp index 50eb2bbab3..caea028b79 100644 --- a/addons/medical_feedback/config.cpp +++ b/addons/medical_feedback/config.cpp @@ -1,5 +1,12 @@ #include "script_component.hpp" +#if __has_include("\z\ace\addons\nomedical\script_component.hpp") +#define PATCH_SKIP "No Medical" +#endif + +#ifdef PATCH_SKIP +ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) +#else class CfgPatches { class ADDON { name = COMPONENT_NAME; @@ -20,3 +27,5 @@ class CfgPatches { #include "CfgVehicles.hpp" #include "RscTitles.hpp" #include "RscInGameUI.hpp" + +#endif diff --git a/addons/medical_gui/addon.toml b/addons/medical_gui/addon.toml new file mode 100644 index 0000000000..7cfef775ee --- /dev/null +++ b/addons/medical_gui/addon.toml @@ -0,0 +1,2 @@ +[preprocess] +enabled = false diff --git a/addons/medical_gui/config.cpp b/addons/medical_gui/config.cpp index b09143a6c9..eb3ac27561 100644 --- a/addons/medical_gui/config.cpp +++ b/addons/medical_gui/config.cpp @@ -1,5 +1,12 @@ #include "script_component.hpp" +#if __has_include("\z\ace\addons\nomedical\script_component.hpp") +#define PATCH_SKIP "No Medical" +#endif + +#ifdef PATCH_SKIP +ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) +#else class CfgPatches { class ADDON { name = COMPONENT_NAME; @@ -18,3 +25,5 @@ class CfgPatches { #include "CfgEventHandlers.hpp" #include "CfgVehicles.hpp" #include "gui.hpp" + +#endif diff --git a/addons/medical_statemachine/addon.toml b/addons/medical_statemachine/addon.toml new file mode 100644 index 0000000000..7cfef775ee --- /dev/null +++ b/addons/medical_statemachine/addon.toml @@ -0,0 +1,2 @@ +[preprocess] +enabled = false diff --git a/addons/medical_statemachine/config.cpp b/addons/medical_statemachine/config.cpp index 23a55f5258..2b396c8b8c 100644 --- a/addons/medical_statemachine/config.cpp +++ b/addons/medical_statemachine/config.cpp @@ -1,5 +1,12 @@ #include "script_component.hpp" +#if __has_include("\z\ace\addons\nomedical\script_component.hpp") +#define PATCH_SKIP "No Medical" +#endif + +#ifdef PATCH_SKIP +ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) +#else class CfgPatches { class ADDON { name = COMPONENT_NAME; @@ -16,3 +23,5 @@ class CfgPatches { #include "Statemachine.hpp" #include "CfgEventHandlers.hpp" + +#endif diff --git a/addons/medical_status/addon.toml b/addons/medical_status/addon.toml new file mode 100644 index 0000000000..7cfef775ee --- /dev/null +++ b/addons/medical_status/addon.toml @@ -0,0 +1,2 @@ +[preprocess] +enabled = false diff --git a/addons/medical_status/config.cpp b/addons/medical_status/config.cpp index 69c1b2fd27..dc68c63bcc 100644 --- a/addons/medical_status/config.cpp +++ b/addons/medical_status/config.cpp @@ -1,5 +1,12 @@ #include "script_component.hpp" +#if __has_include("\z\ace\addons\nomedical\script_component.hpp") +#define PATCH_SKIP "No Medical" +#endif + +#ifdef PATCH_SKIP +ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) +#else class CfgPatches { class ADDON { name = COMPONENT_NAME; @@ -16,3 +23,5 @@ class CfgPatches { #include "ACE_settings.hpp" #include "CfgEventHandlers.hpp" + +#endif diff --git a/addons/medical_treatment/addon.toml b/addons/medical_treatment/addon.toml new file mode 100644 index 0000000000..7cfef775ee --- /dev/null +++ b/addons/medical_treatment/addon.toml @@ -0,0 +1,2 @@ +[preprocess] +enabled = false diff --git a/addons/medical_treatment/config.cpp b/addons/medical_treatment/config.cpp index 1664eed719..9c77b37f13 100644 --- a/addons/medical_treatment/config.cpp +++ b/addons/medical_treatment/config.cpp @@ -1,5 +1,12 @@ #include "script_component.hpp" +#if __has_include("\z\ace\addons\nomedical\script_component.hpp") +#define PATCH_SKIP "No Medical" +#endif + +#ifdef PATCH_SKIP +ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) +#else class CfgPatches { class ADDON { name = COMPONENT_NAME; @@ -22,3 +29,5 @@ class CfgPatches { #include "CfgVehicles.hpp" #include "CfgWeapons.hpp" #include "Cfg3DEN.hpp" + +#endif diff --git a/addons/medical_vitals/addon.toml b/addons/medical_vitals/addon.toml new file mode 100644 index 0000000000..7cfef775ee --- /dev/null +++ b/addons/medical_vitals/addon.toml @@ -0,0 +1,2 @@ +[preprocess] +enabled = false diff --git a/addons/medical_vitals/config.cpp b/addons/medical_vitals/config.cpp index 91995242c9..f00fbe7174 100644 --- a/addons/medical_vitals/config.cpp +++ b/addons/medical_vitals/config.cpp @@ -1,5 +1,12 @@ #include "script_component.hpp" +#if __has_include("\z\ace\addons\nomedical\script_component.hpp") +#define PATCH_SKIP "No Medical" +#endif + +#ifdef PATCH_SKIP +ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) +#else class CfgPatches { class ADDON { name = COMPONENT_NAME; @@ -15,3 +22,5 @@ class CfgPatches { }; #include "CfgEventHandlers.hpp" + +#endif diff --git a/addons/realisticnames/addon.toml b/addons/realisticnames/addon.toml new file mode 100644 index 0000000000..7cfef775ee --- /dev/null +++ b/addons/realisticnames/addon.toml @@ -0,0 +1,2 @@ +[preprocess] +enabled = false diff --git a/addons/realisticnames/config.cpp b/addons/realisticnames/config.cpp index e8f4afae46..e98d18f0b6 100644 --- a/addons/realisticnames/config.cpp +++ b/addons/realisticnames/config.cpp @@ -1,5 +1,12 @@ #include "script_component.hpp" +#if __has_include("\z\ace\addons\norealisticnames\script_component.hpp") +#define PATCH_SKIP "No Realistic Names" +#endif + +#ifdef PATCH_SKIP +ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) +#else class CfgPatches { class ADDON { name = COMPONENT_NAME; @@ -20,3 +27,5 @@ class CfgPatches { #include "CfgMagazines.hpp" #include "CfgVehicles.hpp" #include "CfgWeapons.hpp" + +#endif diff --git a/optionals/nomedical/$PBOPREFIX$ b/optionals/nomedical/$PBOPREFIX$ new file mode 100644 index 0000000000..3f6d8ad8e6 --- /dev/null +++ b/optionals/nomedical/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\nomedical diff --git a/optionals/nomedical/config.cpp b/optionals/nomedical/config.cpp new file mode 100644 index 0000000000..e392061445 --- /dev/null +++ b/optionals/nomedical/config.cpp @@ -0,0 +1,15 @@ +#include "script_component.hpp" + +class CfgPatches { + class ADDON { + name = COMPONENT_NAME; + units[] = {}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {}; + author = ECSTRING(common,ACETeam); + authors[] = {"Dystopian"}; + url = ECSTRING(main,URL); + VERSION_CONFIG; + }; +}; diff --git a/optionals/nomedical/script_component.hpp b/optionals/nomedical/script_component.hpp new file mode 100644 index 0000000000..8fb8b9c73b --- /dev/null +++ b/optionals/nomedical/script_component.hpp @@ -0,0 +1,6 @@ +#define COMPONENT nomedical +#define COMPONENT_BEAUTIFIED No Medical + +#include "\z\ace\addons\main\script_mod.hpp" + +#include "\z\ace\addons\main\script_macros.hpp" diff --git a/optionals/norealisticnames/$PBOPREFIX$ b/optionals/norealisticnames/$PBOPREFIX$ new file mode 100644 index 0000000000..f4a3ddedba --- /dev/null +++ b/optionals/norealisticnames/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\norealisticnames diff --git a/optionals/norealisticnames/config.cpp b/optionals/norealisticnames/config.cpp new file mode 100644 index 0000000000..e392061445 --- /dev/null +++ b/optionals/norealisticnames/config.cpp @@ -0,0 +1,15 @@ +#include "script_component.hpp" + +class CfgPatches { + class ADDON { + name = COMPONENT_NAME; + units[] = {}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {}; + author = ECSTRING(common,ACETeam); + authors[] = {"Dystopian"}; + url = ECSTRING(main,URL); + VERSION_CONFIG; + }; +}; diff --git a/optionals/norealisticnames/script_component.hpp b/optionals/norealisticnames/script_component.hpp new file mode 100644 index 0000000000..ed570dd357 --- /dev/null +++ b/optionals/norealisticnames/script_component.hpp @@ -0,0 +1,6 @@ +#define COMPONENT norealisticnames +#define COMPONENT_BEAUTIFIED No Realistic Names + +#include "\z\ace\addons\main\script_mod.hpp" + +#include "\z\ace\addons\main\script_macros.hpp"