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

Update medical items #203

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

Update medical items #203

wants to merge 6 commits into from

Conversation

kil0byt3
Copy link
Member

@kil0byt3 kil0byt3 commented Oct 10, 2024

riflemen +1 TQ, +1 PK Blister (2 uses of pk)
medics + naloxone, +bottle of painkillers (2 for SM, 4 for PM)

arty + plotting board

@kil0byt3
Copy link
Member Author

I did this on my phone and it was not easy this app sucks

@AChesheireCat
Copy link
Contributor

When and why did we turn off the difference in bandages? It's even baked into some of our medical documentation. Should we turn that back on?

AChesheireCat and others added 3 commits October 10, 2024 13:28
Adds Naloxone to the default medic loadouts in small quantities

Adds the ACE Plotting Board to the Base Artillery kit
@kil0byt3
Copy link
Member Author

kil0byt3 commented Oct 21, 2024

ready for review with changes from https://discord.com/channels/204621032428929025/1293996766106222612

riflemen +1 TQ,
medics + naloxone, +bottle of painkillers (2 for SM, 4 for PM)
ftls +1 bottle of painkillers for their FT(thoughts?)

arty + plotting board

@lambdatiger
Copy link

lambdatiger commented Oct 21, 2024

ftls +1 bottle of painkillers for their FT(thoughts?)

Maybe a separate PR for that? Maybe we can make a custom painkiller magazine/item that is like a 1-2 count? Not 100% sure.

@AChesheireCat
Copy link
Contributor

I concur with Lambda - I think a preferable options would be if we had "painkiller blister packs" that held like 1-2 or 3-4 uses. If we make a 1-2 option, we'd even be incentivized to just issue those to everyone as well :)

For now, I think it's fine if just the Medics receive painkiller bottles imo

@kil0byt3
Copy link
Member Author

No more FTL PK, do it the other way in separate PR (but ideally would get merged at the same time as this one)

AChesheireCat added a commit to AChesheireCat/POTATO that referenced this pull request Oct 21, 2024
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
PabstMirror added a commit to BourbonWarfare/POTATO that referenced this pull request Nov 17, 2024
* 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 <pabstmirror@gmail.com>

* add to items

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
@kil0byt3
Copy link
Member Author

ready for review with new PK blister pack implemented (BourbonWarfare/POTATO#583)

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

Successfully merging this pull request may close these issues.

4 participants