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

Add Separate Treatment Times for Exceeding Required Skill level #10696

Merged
merged 21 commits into from
Feb 4, 2025

Conversation

john681611
Copy link
Contributor

@john681611 john681611 commented Jan 29, 2025

When merged this pull request will:

  • Add "Skilled" Variants of the treatment time setting for

    • Auto-Injector
    • Tourniquet
    • IV Bag
    • Splint

    "Skilled" is defined as exceeding the required skill level for treatment.
    Eg If anyone can do it then skilled is Medic or Doctor
    If a Medic is required, then Skilled is a Doctor

20250129184850_1

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

@john681611 john681611 changed the title Add Separate Settings for Skilled medical actions Add Separate Treatment Times for Medics and Doctors Jan 29, 2025
Copy link
Contributor

@rautamiekka rautamiekka left a comment

Choose a reason for hiding this comment

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

Typo fixes.

addons/medical_treatment/stringtable.xml Outdated Show resolved Hide resolved
addons/medical_treatment/stringtable.xml Outdated Show resolved Hide resolved
addons/medical_treatment/stringtable.xml Outdated Show resolved Hide resolved
addons/medical_treatment/stringtable.xml Outdated Show resolved Hide resolved
Copy link
Member

@Mike-MF Mike-MF left a comment

Choose a reason for hiding this comment

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

I've tested it, works just fine. My changes are because I feel like it doesn't flow very well when reading it.

addons/medical_treatment/stringtable.xml Outdated Show resolved Hide resolved
addons/medical_treatment/stringtable.xml Outdated Show resolved Hide resolved
addons/medical_treatment/stringtable.xml Outdated Show resolved Hide resolved
addons/medical_treatment/stringtable.xml Outdated Show resolved Hide resolved
@Cplhardcore
Copy link
Contributor

Just my two cents, have either a setting that designates a level at which someone is skilled (eg, doctor only or medic and doctor) or split it up further so that's there's a value for doctors and one for medics

@john681611 john681611 requested a review from Mike-MF January 30, 2025 08:17
@PabstMirror PabstMirror added this to the 3.19.1 milestone Feb 2, 2025
@PabstMirror PabstMirror added the kind/enhancement Release Notes: **IMPROVED:** label Feb 2, 2025
@@ -30,16 +30,17 @@ if !(_this call FUNC(canTreat)) exitWith {false};
private _config = configFile >> QGVAR(actions) >> _classname;

// Get treatment time from config, exit if treatment time is zero
Copy link
Contributor

@LinkIsGrim LinkIsGrim Feb 3, 2025

Choose a reason for hiding this comment

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

Personally, I'd rather a unit be considered skilled if it has required medic level for treatment + 1.

Stringtables would need to be changed to reflect this. Up to you, though.

Copy link
Contributor Author

@john681611 john681611 Feb 3, 2025

Choose a reason for hiding this comment

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

I may mess with this idea. But I'd rather the PR as it get in if it's not a simple implementation Turns out it was relatively easy.

@john681611 john681611 changed the title Add Separate Treatment Times for Medics and Doctors Add Separate Treatment Times Exceeding Required Skill level Feb 3, 2025
@john681611 john681611 changed the title Add Separate Treatment Times Exceeding Required Skill level Add Separate Treatment Times for Exceeding Required Skill level Feb 3, 2025
@PabstMirror PabstMirror merged commit 5054bbc into acemod:master Feb 4, 2025
3 checks passed
@john681611 john681611 deleted the IV-time-settings branch February 5, 2025 08:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/enhancement Release Notes: **IMPROVED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants