Skip to content

Commit

Permalink
Requested Fixes
Browse files Browse the repository at this point in the history
- Split original Painkiller_Patch.hpp into their respective files (CfgMagazines.hpp, CfgVehicles.hpp, CfgWeapons.hpp)

- Fixed image pathing per HEMTT

- Removed redundant line in ACE_Medical_Treatment_Actions.hpp

- Updated config.cpp to include the new broken out files
  • Loading branch information
AChesheireCat committed Oct 21, 2024
1 parent 0922688 commit cc6cf1b
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 41 deletions.
2 changes: 0 additions & 2 deletions addons/miscMedical/ACE_Medical_Treatment_Actions.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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}};
Expand Down
14 changes: 14 additions & 0 deletions addons/miscMedical/CfgMagazines.hpp
Original file line number Diff line number Diff line change
@@ -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;
};
};
12 changes: 12 additions & 0 deletions addons/miscMedical/CfgVehicles.hpp
Original file line number Diff line number Diff line change
@@ -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);
};
};
};
14 changes: 14 additions & 0 deletions addons/miscMedical/CfgWeapons.hpp
Original file line number Diff line number Diff line change
@@ -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);
};
};
40 changes: 1 addition & 39 deletions addons/miscMedical/Painkiller_Patch.hpp
Original file line number Diff line number Diff line change
@@ -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 {};
};
};
};
3 changes: 3 additions & 0 deletions addons/miscMedical/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit cc6cf1b

Please sign in to comment.