Medical Treatment - Add Additional Conditions for PAK Use #8964

dgibso29 · 2022-07-12T13:54:39Z

When merged this pull request will:
Personal Aid Kits now have additional optional conditions for use:

Minimum Blood Level
Minimum Heart Rate
Patient must not be in pain
Patient must have no untreated fractures
Patient must have no open wounds
Patient must have no open or bandaged wounds (Must be fully stitched)

This PR is an attempt to resuscitate the work done in stale PR #7684, which was created prior to major build pipeline changes. The actual feature work has been recreated and re-tested here.

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}.

Personal Aid Kits now have additional optional conditions for use: - Minimum Blood Level - Minimum Heart Rate - Patient must not be in pain - Patient must have no open wounds - Patient must have no open or bandaged wounds (Must be fully stitched) Co-Authored-By: André Vennberg <andre.vennberg@gmail.com>

Cre8or · 2022-07-12T17:45:51Z

It seems reasonable to give mission makers more control over the "embedded" aspects of ACE's medical system. Without PRs like these, communities have to resort to making in-house mods to expose the underlying features as CBA options. Which is fine if you only have to do this for one mod, but repeat that process a few times and your addon dependency graph quickly becomes more intricate than the lineage of the British royal family.

Jokes aside - I appreciate your dedication for keeping this submission going, and hope this gets more attention this time! 🤞

Joecuronium · 2022-07-16T11:31:17Z

As a missionmaker I would very much appreciate this being added, since currently I don't give out PAKs since it represents an "auto-heal" button in an otherwise pretty realistic representation of how med-care should work.
Tying the PAK to a condition would allow to be an actual tool that rewards proper care by lower-tier medics until the pt can be seen ba a doc.

addons/medical_status/functions/fnc_isInStableCondition.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

dgibso29 · 2022-10-13T00:39:19Z

addons/medical_status/functions/fnc_isInStableCondition.sqf

+// Untreated fractures have a value of 1. Treated are -1.
+if (EGVAR(medical_treatment,allowFracturesPAK) == 0 && { ((GET_FRACTURES(_unit) findIf {_x isEqualTo 1}) != -1) })  exitWith {false}; 


Added an additional option to allow fractures to prevent PAK use.

…m/dgibso29/ACE3 into Feature/Additional-PAK-Conditions

dgibso29 · 2022-10-13T00:50:43Z

Current state of PR has been successfully tested on dedicated server.

rautamiekka

What little I know about ACE's workings it's good, I'll leave the rest to others.

dgibso29 · 2023-03-07T19:40:54Z

@rautamiekka Just bumping this as it seems to be falling under the radar. Thanks for any context you can provide.

dgibso29 · 2023-03-19T22:40:45Z

@veteran29 Apologies for the ping, but you have been active in the repository recently and am trying to get movement on this PR. These changes have been approved in the past and gone through several rounds of feedback from @mharis001, but it seems to be falling under the radar since.

Thanks!

LinkIsGrim · 2023-06-28T10:43:08Z

addons/medical_status/functions/fnc_isInStableCondition.sqf

+if (EGVAR(medical_treatment,allowPainPAK) == 0 && { IS_IN_PAIN(_unit) }) exitWith {false};
+
+// Untreated fractures have a value of 1. Treated are -1.
+if (EGVAR(medical_treatment,allowFracturesPAK) == 0 && { ((GET_FRACTURES(_unit) findIf {_x isEqualTo 1}) != -1) })  exitWith {false};


Suggested change

if (EGVAR(medical_treatment,allowFracturesPAK) == 0 && { ((GET_FRACTURES(_unit) findIf {_x isEqualTo 1}) != -1) }) exitWith {false};

if (EGVAR(medical_treatment,allowFracturesPAK) == 0 && {1 in (GET_FRACTURES(_unit))}) exitWith {false};

Minor optimization.

LinkIsGrim · 2023-06-28T10:44:01Z

addons/medical_status/functions/fnc_isInStableCondition.sqf

+if (_requiredWoundState == PAK_REQ_OPEN) exitWith {true};
+
+// Parameterize this value to reduce duplication.
+private _hasOpenWounds = (GET_OPEN_WOUNDS(_unit) findIf {_x select 2 > 0 && {_x select 3 > 0}}) != -1;


Needs to be updated for #8926.

LinkIsGrim · 2023-06-28T10:45:09Z

addons/medical_treatment/initSettings.sqf

IMO this should be moved to its own category, but out of scope for this PR.

LinkIsGrim · 2023-06-28T10:45:56Z

addons/medical_treatment/stringtable.xml

I'm not a fan of these setting titles.

LinkIsGrim · 2023-06-28T10:46:09Z

addons/medical_treatment/stringtable.xml

+            <English>Required Wound State PAK</English>
+        </Key>
+        <Key ID="STR_ACE_Medical_Treatment_RequiredWoundStatePAK_Description">
+            <English>Controls whether a patient's wounds must be bandaged or stitched in order to use a PAK.</English>


Suggested change

<English>Controls whether a patient's wounds must be bandaged or stitched in order to use a PAK.</English>

<English>Controls whether a patient's wounds must be bandaged or stitched in order to use a Personal Aid Kit.</English>

LinkIsGrim · 2023-06-28T10:48:42Z

addons/medical_status/functions/fnc_isInStableCondition.sqf

+) exitWith {false};
+
+private _requiredBloodVolume = DEFAULT_BLOOD_VOLUME * (EGVAR(medical_treatment,minBloodPAK) / 100);
+if (GET_BLOOD_VOLUME(_unit) < _requiredBloodVolume) exitWith {false};


This'd be more intuitive if it used qualitative blood loss (hemmorhage class, "Lost some/a lot of/etc blood") instead.

LinkIsGrim · 2023-06-28T10:49:08Z

docs/wiki/feature/medical-system.md

@@ -176,6 +176,14 @@ Self IV Transfusion: See "Self PAK Usage".

 Time Coefficient PAK: This setting controls how long a PAK takes to apply. Set to higher values to increase, lower to decrease. PAK has a minimum of 10 seconds usage time.

+Required Wounds State PAK: Controls whether a patient's wounds must be bandaged or stitched in order to use a PAK.


Suggested change

Required Wounds State PAK: Controls whether a patient's wounds must be bandaged or stitched in order to use a PAK.

Required Wounds State PAK: Controls whether a patient's wounds must be bandaged or stitched in order to use a Personal Aid Kit.

LinkIsGrim · 2023-06-28T10:49:22Z

docs/wiki/feature/medical-system.md

@@ -176,6 +176,14 @@ Self IV Transfusion: See "Self PAK Usage".

 Time Coefficient PAK: This setting controls how long a PAK takes to apply. Set to higher values to increase, lower to decrease. PAK has a minimum of 10 seconds usage time.

+Required Wounds State PAK: Controls whether a patient's wounds must be bandaged or stitched in order to use a PAK.
+
+Allow Pain PAK: Controls whether PAKs can be used on patients in pain.


Suggested change

Allow Pain PAK: Controls whether PAKs can be used on patients in pain.

Allow Pain PAK: Controls whether Personal Aid Kits can be used on patients in pain.

LinkIsGrim · 2023-06-28T10:49:35Z

docs/wiki/feature/medical-system.md

+
+Allow Pain PAK: Controls whether PAKs can be used on patients in pain.
+
+Min Blood PAK: Minimum blood volume percentage required to use a PAK.


Suggested change

Min Blood PAK: Minimum blood volume percentage required to use a PAK.

Min Blood PAK: Minimum blood volume percentage required to use a Personal Aid Kit.

LinkIsGrim · 2023-06-28T10:49:45Z

docs/wiki/feature/medical-system.md

+
+Min Blood PAK: Minimum blood volume percentage required to use a PAK.
+
+Min Heart Rate PAK: Minimum heart rate required to use a PAK.


Suggested change

Min Heart Rate PAK: Minimum heart rate required to use a PAK.

Min Heart Rate PAK: Minimum heart rate required to use a Personal Aid Kit.

dgibso29 · 2023-07-05T19:32:11Z

Kindly, after nearly 3 years of trying to get this merged, it is no longer worth redeveloping this yet again versus maintaining an override in our framework.

dgibso29 mentioned this pull request Jul 12, 2022

Medical - Add more conditions on when the PAK can be used (#7682) #7684

Closed

dgibso29 mentioned this pull request Oct 11, 2022

[Feature] Remove PAK Stitching Bypass Exploit CombinedArmsGaming/CAFE3#123

Closed

Fixed bug around Bruises, refactored some sections.

94b3a82

rautamiekka reviewed Oct 12, 2022

View reviewed changes

addons/medical_status/functions/fnc_isInStableCondition.sqf Outdated Show resolved Hide resolved

dgibso29 and others added 2 commits October 12, 2022 20:07

Update addons/medical_status/functions/fnc_isInStableCondition.sqf

fbd8380

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

Added support for Fractures blocking PAK use

e2172b4

dgibso29 commented Oct 13, 2022

View reviewed changes

dgibso29 requested a review from rautamiekka October 13, 2022 00:41

dgibso29 added 2 commits October 12, 2022 20:46

Added support for Fractures blocking PAK use

7f5e8b9

Merge branch 'Feature/Additional-PAK-Conditions' of https://github.co…

6500cc3

…m/dgibso29/ACE3 into Feature/Additional-PAK-Conditions

rautamiekka approved these changes Oct 22, 2022

View reviewed changes

Fix open wounds requirement

83d0f65

BrettMayson approved these changes May 16, 2023

View reviewed changes

BrettMayson added this to the 3.16.0 milestone May 16, 2023

LinkIsGrim requested changes Jun 28, 2023

View reviewed changes

dgibso29 closed this Jul 5, 2023

LinkIsGrim modified the milestones: 3.16.0, Backlog Jul 24, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Medical Treatment - Add Additional Conditions for PAK Use #8964

Medical Treatment - Add Additional Conditions for PAK Use #8964

dgibso29 commented Jul 12, 2022 •

edited

Loading

Cre8or commented Jul 12, 2022

Joecuronium commented Jul 16, 2022

dgibso29 Oct 13, 2022

dgibso29 commented Oct 13, 2022

rautamiekka left a comment

dgibso29 commented Mar 7, 2023

dgibso29 commented Mar 19, 2023

LinkIsGrim Jun 28, 2023

LinkIsGrim Jun 28, 2023

LinkIsGrim Jun 28, 2023

LinkIsGrim Jun 28, 2023

LinkIsGrim Jun 28, 2023

LinkIsGrim Jun 28, 2023

LinkIsGrim Jun 28, 2023

LinkIsGrim Jun 28, 2023

LinkIsGrim Jun 28, 2023

LinkIsGrim Jun 28, 2023

dgibso29 commented Jul 5, 2023

		// Untreated fractures have a value of 1. Treated are -1.
		if (EGVAR(medical_treatment,allowFracturesPAK) == 0 && { ((GET_FRACTURES(_unit) findIf {_x isEqualTo 1}) != -1) }) exitWith {false};

	<English>Controls whether a patient's wounds must be bandaged or stitched in order to use a PAK.</English>
	<English>Controls whether a patient's wounds must be bandaged or stitched in order to use a Personal Aid Kit.</English>

		@@ -176,6 +176,14 @@ Self IV Transfusion: See "Self PAK Usage".

		Time Coefficient PAK: This setting controls how long a PAK takes to apply. Set to higher values to increase, lower to decrease. PAK has a minimum of 10 seconds usage time.

		Required Wounds State PAK: Controls whether a patient's wounds must be bandaged or stitched in order to use a PAK.

	Allow Pain PAK: Controls whether PAKs can be used on patients in pain.
	Allow Pain PAK: Controls whether Personal Aid Kits can be used on patients in pain.


		Allow Pain PAK: Controls whether PAKs can be used on patients in pain.

		Min Blood PAK: Minimum blood volume percentage required to use a PAK.


		Min Blood PAK: Minimum blood volume percentage required to use a PAK.

		Min Heart Rate PAK: Minimum heart rate required to use a PAK.

Medical Treatment - Add Additional Conditions for PAK Use #8964

Medical Treatment - Add Additional Conditions for PAK Use #8964

Conversation

dgibso29 commented Jul 12, 2022 • edited Loading

IMPORTANT

Cre8or commented Jul 12, 2022

Joecuronium commented Jul 16, 2022

Choose a reason for hiding this comment

dgibso29 commented Oct 13, 2022

rautamiekka left a comment

Choose a reason for hiding this comment

dgibso29 commented Mar 7, 2023

dgibso29 commented Mar 19, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dgibso29 commented Jul 5, 2023

dgibso29 commented Jul 12, 2022 •

edited

Loading