diff --git a/addons/miscMedical/ACE_Medical_Treatment_Actions.hpp b/addons/miscMedical/ACE_Medical_Treatment_Actions.hpp index 58a8ec9d..ec6b2686 100644 --- a/addons/miscMedical/ACE_Medical_Treatment_Actions.hpp +++ b/addons/miscMedical/ACE_Medical_Treatment_Actions.hpp @@ -7,8 +7,6 @@ class ace_medical_treatment_actions { items[] = {"potato_naloxone"}; litter[] = {{"ACE_MedicalLitter_atropine"}}; }; - class Painkillers: Morphine {}; - class Pkblister: Painkillers {}; class BasicBandage; class ApplyTourniquet: BasicBandage { sounds[] = {{"z\POTATO\addons\miscMedical\data\tourniquet.ogg",5,1,50}}; diff --git a/addons/miscMedical/CfgMagazines.hpp b/addons/miscMedical/CfgMagazines.hpp new file mode 100644 index 00000000..b117ceb6 --- /dev/null +++ b/addons/miscMedical/CfgMagazines.hpp @@ -0,0 +1,14 @@ +// License Attribution req: UI image authored by user grmarcstock via Vecteezy.com + +class CfgMagazines { + class CA_Magazine; + class ACE_painkillers: CA_Magazine {}; + class potato_pkblister: ACE_painkillers { + author = "AChesheireCat"; + displayName = "Painkiller Blister Pack"; + descriptionShort = "For physical pain only"; + descriptionUse = "A blister pack containing individualized painkiller tablets, regularly issued in IFAKs"; + picture = QPATHTOEF(miscMedical,ui\pkblister_ca.paa); + count = 2; + }; +}; \ No newline at end of file diff --git a/addons/miscMedical/CfgVehicles.hpp b/addons/miscMedical/CfgVehicles.hpp new file mode 100644 index 00000000..c0936b99 --- /dev/null +++ b/addons/miscMedical/CfgVehicles.hpp @@ -0,0 +1,12 @@ +class CfgVehicles { + class Item_Base_F; + class ACE_painkillersItem: Item_Base_F {}; + class potato_pkblisterItem: ACE_painkillersItem { + author = "AChesheireCat"; + displayName = "Painkiller Blister Pack"; + vehicleClass = "Items"; + class TransportItems { + MACRO_ADDMAGAZINE(potato_pkblister,1); + }; + }; +}; \ No newline at end of file diff --git a/addons/miscMedical/CfgWeapons.hpp b/addons/miscMedical/CfgWeapons.hpp new file mode 100644 index 00000000..a2154bff --- /dev/null +++ b/addons/miscMedical/CfgWeapons.hpp @@ -0,0 +1,14 @@ +// License Attribution req: UI image authored by user grmarcstock via Vecteezy.com + +class CfgWeapons { + class ACE_ItemCore; + class ACE_painkillers_Item: ACE_ItemCore {}; + class potato_pkblister: ACE_painkillers { + scope = 2; + author = "AChesheireCat"; + displayName = "Painkiller Blister Pack"; + descriptionShort = "For physical pain only"; + descriptionUse = "A blister pack containing individualized painkiller tablets, regularly issued in IFAKs"; + picture = QPATHTOEF(miscMedical,ui\pkblister_ca.paa); + }; +}; \ No newline at end of file diff --git a/addons/miscMedical/Painkiller_Patch.hpp b/addons/miscMedical/Painkiller_Patch.hpp index 514e0d1d..ff0cfcfe 100644 --- a/addons/miscMedical/Painkiller_Patch.hpp +++ b/addons/miscMedical/Painkiller_Patch.hpp @@ -1,44 +1,6 @@ -// License Attribution req: UI image authored by user grmarcstock via Vecteezy.com - -class CfgMagazines { - class CA_Magazine; - class ACE_painkillers: CA_Magazine {}; - class potato_pkblister: ACE_painkillers { - author = "AChesheireCat"; - displayName = "Painkiller Blister Pack"; - descriptionShort = "For physical pain only"; - descriptionUse = "A blister pack containing individualized painkiller tablets, regularly issued in IFAKs"; - picture = QPATHOF(ui\pkblister_ca.paa); - count = 2; - }; -}; -class CfgVehicles { - class Item_Base_F; - class ACE_painkillersItem: Item_Base_F {}; - class potato_pkblisterItem: ACE_painkillersItem { - author = "AChesheireCat"; - displayName = "Painkiller Blister Pack"; - vehicleClass = "Items"; - class TransportItems { - MACRO_ADDMAGAZINE(potato_pkblister,1); - }; - }; -}; -class CfgWeapons { - class ACE_ItemCore; - class ACE_painkillers_Item: ACE_ItemCore {}; - class potato_pkblister: ACE_painkillers { - scope = 2; - author = "AChesheireCat"; - displayName = "Painkiller Blister Pack"; - descriptionShort = "For physical pain only"; - descriptionUse = "A blister pack containing individualized painkiller tablets, regularly issued in IFAKs"; - picture = QPATHOF(ui\pkblister_ca.paa); - }; -}; class ace_medical_treatment { class Medication { class Painkillers; class Pkblister: Painkillers {}; }; -}; +}; \ No newline at end of file diff --git a/addons/miscMedical/config.cpp b/addons/miscMedical/config.cpp index c08735e1..f8c644c7 100644 --- a/addons/miscMedical/config.cpp +++ b/addons/miscMedical/config.cpp @@ -15,4 +15,7 @@ class CfgPatches { #include "CfgEventHandlers.hpp" #include "Naloxone_Patch.hpp" #include "Painkiller_Patch.hpp" +#include "CfgMagazines.hpp" +#include "CfgVehicles.hpp" +#include "CfgWeapons.hpp" #include "ACE_Medical_Treatment_Actions.hpp" \ No newline at end of file