Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds a low-count painkiller alternative #583

Open
wants to merge 9 commits into
base: master
Choose a base branch
from

Conversation

AChesheireCat
Copy link
Contributor

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

For context, reference the following:

#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

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

BourbonWarfare#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
Added Painkiller_Patch.hpp to #include order.
Copy link
Contributor

@TheCandianVendingMachine TheCandianVendingMachine left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we have the license to distribute the pkblister_ca.paa? aka, are we violating any copyright?

configs are all correct from what i can see. just some comments on the actual files

addons/miscMedical/ACE_Medical_Treatment_Actions.hpp Outdated Show resolved Hide resolved
addons/miscMedical/Painkiller_Patch.hpp Outdated Show resolved Hide resolved
addons/miscMedical/Painkiller_Patch.hpp Outdated Show resolved Hide resolved
addons/miscMedical/Painkiller_Patch.hpp Outdated Show resolved Hide resolved
addons/miscMedical/Painkiller_Patch.hpp Outdated Show resolved Hide resolved
@AChesheireCat
Copy link
Contributor Author

do we have the license to distribute the pkblister_ca.paa? aka, are we violating any copyright?

configs are all correct from what i can see. just some comments on the actual files

I think so - for reference this is the exact link for where I found the image file: https://www.vecteezy.com/vector-art/21385574-pill-tablet-design?autodl_token=608ca36d29a7922b511ffdf557b36320d9a8a5f3b6ac441f7a1ab75e1dd4eca108841db354e955ba929fd3f16f048f29f64c5792ac11f98b435c77da620b3fd7

The license listed on the page is royalty free with the only requirement being attribution by mentioning the author and the website, at least according to the licensing agreement that was included in the download. Honestly, if we don't want the headache I'm fine with just using the original pill bottle - this was just something cool to include lol.

@TheCandianVendingMachine
Copy link
Contributor

if we follow that license im all good with it, no headache at all

- 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
@AChesheireCat
Copy link
Contributor Author

HEMTT doesn't like having both Naloxone_Patch.hpp and the new broken-out files defining the same thing. Should I move the relevant sections in Naloxone_Patch.hpp (CfgVehicles, CfgWeapons) to the new files as well?

@TheCandianVendingMachine
Copy link
Contributor

yes, ideally. i dont think that we can compile with the two definitions regardless, so they need to be consolidated

Moved the CfgVehicles and CfgWeapons sections from Naloxone_Patch.hpp to the new broken-out files CfgVehicles.hpp and CfgWeapons.hpp
I'm dumb... Fixed the duplicate CfgVehicles and CfgWeapons.
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!
addons/miscMedical/config.cpp Outdated Show resolved Hide resolved
Moves the ace_medical_treatment section to its own file "ACE_Medical_Treatment.hpp"

Added new file to includes section under config.cpp
@AChesheireCat AChesheireCat removed the WIP label Oct 22, 2024
AChesheireCat and others added 2 commits October 22, 2024 13:53
Thanks Pabst <3

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

@lambdatiger lambdatiger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At some point we may want to make a model for the garbage left behind or the item itself, but the PR looks good and works as intended.

Thanks for cleaning up the addon as well!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants