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

Airway - Add Manual Suction Pump #453

Merged

Conversation

Apricot-ale
Copy link
Contributor

@Apricot-ale Apricot-ale commented Dec 13, 2023

When merged this pull request will:

  • Add Manual Suction Pump (almost same as ACCUVAC but it disposable and long use time). Disposable features can be optionally disabled or enabled. Of course, you can change the time.
  • Add "suction success hint" if suction is completed when there occluded.
  • Add display name string table for ACCUVAC (Item, Treatment menu).
  • Change treatment action name for ACCUVAC. New name is Airway Suction at EN.
  • Change triage card treatment display name for ACCUVAC (show as Airway Suction at EN). This is treated as the same treatment display name as Manual Suction Pump.

Todo:

  • Add reusability option. (I don't know how... trying to refer IV reuse setting.)
  • Add dedicated hand pumping sound and suction sound.

Picture of item:
suction_normal

IMPORTANT

  • Development Guidelines are read, understood and applied.
  • Title of this PR uses our standard template Component - Add|Fix|Improve|Change|Make|Remove {changes}.

addons/airway/ACE_Medical_Treatment_Actions.hpp Outdated Show resolved Hide resolved
addons/airway/CfgWeapons.hpp Outdated Show resolved Hide resolved
@MiszczuZPolski
Copy link
Collaborator

Add reusability option. (I don't know how)

look at consumeItem, but it depends on what you want to achieve

it's my work!
Reason of why order reversed:
because I don't want to set consumeItem = 1; again.
I referred IV Reuse config.
Should I put it in AcuvacLocal?
Change ACCUVAC item name to upper case
Remove ACCUVAC from the action name of ACCUVAC to make it concise.
Delete "pump" from the action name of "manual suction pump"
Add switching playSound3D for Manual or Accuvac
Added a special sound to the manual pump at start treatment.
Adjusted the tempo and length of the sound when a manual pump suction is successful (edited version old suction sound).
Rename Accuvac sounds to prevent confusion.
@Apricot-ale
Copy link
Contributor Author

in game test complete

@MiszczuZPolski MiszczuZPolski added the kind/feature request Release Notes: **ADDED:** label Dec 21, 2023
@MiszczuZPolski MiszczuZPolski added this to the 2.14.0 milestone Dec 21, 2023
@Apricot-ale Apricot-ale requested a review from MissHeda January 24, 2024 22:23
Copy link
Contributor

@MissHeda MissHeda left a comment

Choose a reason for hiding this comment

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

Looks good to me.

picture = QPATHTOF(ui\suction_normal.paa);
ACE_isMedicalItem = 1;
class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 1.5;
Copy link
Contributor

Choose a reason for hiding this comment

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

change to a lower more realistic number. 1.5 is quite big.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

changed

@Apricot-ale Apricot-ale requested a review from MissHeda January 30, 2024 14:56
Copy link
Contributor

@MissHeda MissHeda left a comment

Choose a reason for hiding this comment

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

Everything matches out, @MiszczuZPolski ready to merge now.

Copy link
Collaborator

@MiszczuZPolski MiszczuZPolski left a comment

Choose a reason for hiding this comment

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

LGTM

@MiszczuZPolski MiszczuZPolski merged commit 2897cea into KAT-Advanced-Medical:dev-Tomcat Jan 30, 2024
3 checks passed
@Apricot-ale Apricot-ale deleted the ManualSuctionDevice branch March 26, 2024 14:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/feature request Release Notes: **ADDED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants