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

Medical Treatment - Add Grave Digging for Corpse Disposal #9276

Merged
merged 25 commits into from
Sep 24, 2023

Conversation

Drofseh
Copy link
Contributor

@Drofseh Drofseh commented Jul 21, 2023

When merged this pull request will:

  • Add the ability to dig a grave for a unit, requires an entrenching tool
  • Create new funciton for both body bag and grave placement

59b3165dd9671229e8da14d951af871a

IMPORTANT

  • If the contribution affects the documentation, please include your changes in this pull request so the documentation will appear on the website.
  • Development Guidelines are read, understood and applied.
  • Title of this PR uses our standard template Component - Add|Fix|Improve|Change|Make|Remove {changes}.

@Drofseh Drofseh changed the title Add BFT Components Medical Treatement - Add Grave Digging for Corpse Disposal Jul 21, 2023
Copy link
Member

@BrettMayson BrettMayson left a comment

Choose a reason for hiding this comment

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

Overall I think this needs a setting

fnc_placeInBodyBagOrGrave.sqf needs to be reworked

addons/medical_treatment/functions/fnc_placeInBodyBag.sqf Outdated Show resolved Hide resolved
@LinkIsGrim
Copy link
Contributor

Morbid.

@Drofseh
Copy link
Contributor Author

Drofseh commented Jul 21, 2023

fnc_placeInBodyBagOrGrave.sqf needs to be reworked

It is a little messy, but I didn't want to make a 2nd function that reused 99% of the same code as the body bag.
Any suggestions for improvement?

@BrettMayson
Copy link
Member

Could also add an option to hide the body without the grave marker, could be useful for PvP

@Drofseh
Copy link
Contributor Author

Drofseh commented Jul 23, 2023

Could also add an option to hide the body without the grave marker, could be useful for PvP

I don't really want to make them disappear without cost.

With this PR if you don't have a body bag you can dig them a grave with your entrenching tool. I think it'll be good for longer format games, especially with a persistence system.

For hiding bodies quickly for PVP I think the corpse dragging that's being worked on is good to get them out of the way, but making them magically disappear is too much.

@BrettMayson
Copy link
Member

I didn't say it should be without cost, still require an entrenching tool, and it can be another setting.

@commy2
Copy link
Contributor

commy2 commented Jul 26, 2023

Cross? What if the guy was muslim/hindu/orthodox/jew/atheist?

@Drofseh
Copy link
Contributor Author

Drofseh commented Jul 26, 2023

Cross? What if the guy was muslim/hindu/orthodox/jew/atheist?

I don't disagree, but these are our options.
6d192069fae80462c189cb5e6f519ed1

The only one without a cross is a grassy one from Contact, but the grass means it won't look good on a lot of terrain, likewise the two with stone or rocks on the left, so I picked the one that is entirely dirt.

- fix flipped bool in fnc_canDigGrave
- improve fnc_placeInBodyBagOrGrave.sqf by splitting out some checks and item assignment into separate bodybag and grave functions
@Drofseh
Copy link
Contributor Author

Drofseh commented Jul 26, 2023

I've overhauled the functions a little, can you let me know what you think @BrettMayson

@jonpas
Copy link
Member

jonpas commented Jul 26, 2023

What about picking the one depending on surface?

@Drofseh
Copy link
Contributor Author

Drofseh commented Jul 26, 2023

What about picking the one depending on surface?

For the type of grave? I don't really think it's worth it, the dirt one should look fine of all surfaces. I just wish the grassy one on the right was dirt, or that it had texture selections.

@Drofseh Drofseh requested review from BrettMayson and johnb432 July 30, 2023 21:33
@Drofseh
Copy link
Contributor Author

Drofseh commented Jul 30, 2023

I feel this is complete now.

Copy link
Contributor

@johnb432 johnb432 left a comment

Choose a reason for hiding this comment

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

Review I made includes:

  • Removing dependency on ace_trenches. If ace_trenches isn't loaded, you can't do the action.
  • Expanded the action so that all third party entrenching tools can be used to bury bodies.
  • Some comment formatting.

However, additions are still needed in XEH_PREP.hpp:

PREP(canDigGrave);
PREP(placeInBodyBagOrGrave);
PREP(placeInGrave);

Change in XEH_postInit.sqf required:
[QGVAR(placeInBodyBag), LINKFUNC(placeInBodyBag)] call CBA_fnc_addEventHandler;

->

[QGVAR(placeInBodyBagOrGrave), LINKFUNC(placeInBodyBagOrGrave)] call CBA_fnc_addEventHandler;

addons/medical_treatment/ACE_Medical_Treatment_Actions.hpp Outdated Show resolved Hide resolved
addons/medical_treatment/functions/fnc_canDigGrave.sqf Outdated Show resolved Hide resolved
addons/medical_treatment/functions/fnc_canDigGrave.sqf Outdated Show resolved Hide resolved
addons/medical_treatment/functions/fnc_canDigGrave.sqf Outdated Show resolved Hide resolved
addons/medical_treatment/functions/fnc_canDigGrave.sqf Outdated Show resolved Hide resolved
addons/medical_treatment/functions/fnc_placeInGrave.sqf Outdated Show resolved Hide resolved
addons/medical_treatment/functions/fnc_placeInBodyBag.sqf Outdated Show resolved Hide resolved
addons/medical_treatment/functions/fnc_placeInBodyBag.sqf Outdated Show resolved Hide resolved
addons/medical_treatment/functions/fnc_placeInBodyBag.sqf Outdated Show resolved Hide resolved
addons/medical_treatment/functions/fnc_placeInBodyBag.sqf Outdated Show resolved Hide resolved
Drofseh and others added 3 commits August 1, 2023 08:46
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
@PabstMirror
Copy link
Contributor

Added ability to change grave type if mission maker really wants to
e.g. unmarked grave
ace_medical_treatment_graveClassname = "Land_Grave_11_F";

@johnb432
Copy link
Contributor

Added ability to change grave type if mission maker really wants to e.g. unmarked grave ace_medical_treatment_graveClassname = "Land_Grave_11_F";

Needs documentation, but good idea!

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
@Drofseh
Copy link
Contributor Author

Drofseh commented Aug 26, 2023

Are we ok with this being the default? I feel like all missions will just have a bunch of graves now. 🤔

I could increase the default and max time to dig if you'd like. Currently 30 default, 120 max (twice that of using a body bag for both)

Co-authored-by: jonpas <jonpas33@gmail.com>
Copy link
Contributor

@johnb432 johnb432 left a comment

Choose a reason for hiding this comment

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

Are we ok with this being the default? I feel like all missions will just have a bunch of graves now. 🤔

I could increase the default and max time to dig if you'd like. Currently 30 default, 120 max (twice that of using a body bag for both)

I think when ACE 3.16.0 is released missions might be flooded with graves, as its a novelty, but it will wear off over time imo. Personally I don't like to wait for interactions, so 30 s seems fine to be, but I can understand if others think it's too quick, although I would set the default to 60 s max.

@LinkIsGrim LinkIsGrim changed the title Medical Treatement - Add Grave Digging for Corpse Disposal Medical Treatment - Add Grave Digging for Corpse Disposal Sep 23, 2023
@PabstMirror PabstMirror added this to the 3.16.0 milestone Sep 23, 2023
@LinkIsGrim
Copy link
Contributor

script_component includes need to be updated

@LinkIsGrim LinkIsGrim merged commit 94f3b30 into acemod:master Sep 24, 2023
@Drofseh Drofseh deleted the add-grave-digging branch September 24, 2023 23:17
@IceBreakr-SBP
Copy link

Any chance to dig up the body? Halloween is approaching ;)

@Drofseh
Copy link
Contributor Author

Drofseh commented Oct 17, 2023

Any chance to dig up the body? Halloween is approaching ;)

lol, sorry you'll have to script that one yourself

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/feature Release Notes: **ADDED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants