Skip to content

Commit

Permalink
Adds a low-count painkiller alternative (#583)
Browse files Browse the repository at this point in the history
* Adds a low-count painkiller alternative

This is a first pass try - it is very much a WIP. I still need to test it.

#582

and

BourbonWarfare/bwmf#203 (comment)

This is the aforementioned "blister pack" of painkillers.

- Only has 2 uses compared to the 10 that the bottle has

- Intent is to be issued in the basic kit so supplement medic capacity to treat pain

* Forgot to update config.cpp

Added Painkiller_Patch.hpp to #include order.

* Requested Fixes

- 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

* Broke-out Naloxone_Patch.hpp

Moved the CfgVehicles and CfgWeapons sections from Naloxone_Patch.hpp to the new broken-out files CfgVehicles.hpp and CfgWeapons.hpp

* Fixed multiple defines

I'm dumb... Fixed the duplicate CfgVehicles and CfgWeapons.

* Moved ace_medical_treatment to config.cpp

Moved the ace_medical_treatment sections from their respective files (Naloxone_Patch.hpp, Painkiller_Patch.hpp) to config.cpp to consolidate and remove multiple defines.

Can rebase elsewhere if this solution is a no-go!

* Breaks out ace_medical_treatment

Moves the ace_medical_treatment section to its own file "ACE_Medical_Treatment.hpp"

Added new file to includes section under config.cpp

* Properly adds pkblister item

Thanks Pabst <3

Co-authored-by: PabstMirror <[email protected]>

* add to items

---------

Co-authored-by: PabstMirror <[email protected]>
  • Loading branch information
AChesheireCat and PabstMirror authored Nov 17, 2024
1 parent 648ad51 commit 6f4b274
Show file tree
Hide file tree
Showing 8 changed files with 71 additions and 41 deletions.
16 changes: 16 additions & 0 deletions addons/miscMedical/ACE_Medical_Treatment.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
class ace_medical_treatment {
class Medication {
class Naloxone {
painReduce = 0;
hrIncreaseLow[] = {0, 0};
hrIncreaseNormal[] = {0, 0};
hrIncreaseHigh[] = {0, 0};
timeInSystem = 180;
timeTillMaxEffect = 1;
maxDose = 0.1;
onOverDose = QFUNC(Naloxone);
incompatibleMedication[] = {};
viscosityChange = 0;
};
};
};
3 changes: 3 additions & 0 deletions addons/miscMedical/ACE_Medical_Treatment_Actions.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,7 @@ class ace_medical_treatment_actions {
class Diagnose: BasicBandage {
sounds[] = {{"z\POTATO\addons\miscMedical\data\diag.ogg",5,1,50}};
};
class Painkillers: Morphine {
items[] = {"ACE_painkillers", "potato_pkblister"};
};
};
13 changes: 13 additions & 0 deletions addons/miscMedical/CfgMagazines.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// License Attribution req: UI image authored by user grmarcstock via Vecteezy.com

class CfgMagazines {
class ACE_painkillers;
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;
};
};
22 changes: 22 additions & 0 deletions addons/miscMedical/CfgVehicles.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
class CfgVehicles {
class Item_Base_F;
class potato_naloxoneItem: Item_Base_F {
scope = 2;
scopeCurator = 2;
displayName = "Naloxone Autoinjector";
author = "Alablm";
vehicleClass = "Items";
class TransportItems {
MACRO_ADDITEM(potato_naloxone,1);
};
};
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);
};
};
};
12 changes: 12 additions & 0 deletions addons/miscMedical/CfgWeapons.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// License Attribution req: UI image authored by user grmarcstock via Vecteezy.com

class CfgWeapons {
class ACE_atropine;
class potato_naloxone: ACE_atropine {
scope = 2;
author = "Alablm";
displayName = "Naloxone Autoinjector";
descriptionShort = "Used to treat opioid overdose";
descriptionUse = "A drug widely used to treat opioid overdoses by blocking opioid receptors";
};
};
39 changes: 0 additions & 39 deletions addons/miscMedical/Naloxone_Patch.hpp

This file was deleted.

7 changes: 5 additions & 2 deletions addons/miscMedical/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,8 @@ class CfgPatches {
};

#include "CfgEventHandlers.hpp"
#include "Naloxone_Patch.hpp"
#include "ACE_Medical_Treatment_Actions.hpp"
#include "CfgMagazines.hpp"
#include "CfgVehicles.hpp"
#include "CfgWeapons.hpp"
#include "ACE_Medical_Treatment_Actions.hpp"
#include "ACE_Medical_Treatment.hpp"
Binary file added addons/miscMedical/ui/pkblister_ca.paa
Binary file not shown.

0 comments on commit 6f4b274

Please sign in to comment.