Medical - Support Magazine Treatment Items by BrettMayson · Pull Request #9816 · acemod/ACE3

BrettMayson · 2024-03-01T23:34:44Z

When merged this pull request will:

Moving over from KAT so they can stop overwriting ACE functions
Converts the painkiller to a magazine

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

Co-Authored-By: Blue <itzblueman@gmail.com>

Co-Authored-By: johnb432 <58661205+johnb432@users.noreply.github.com>

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

johnb432

Despite recommending isClass (configFile >> "CfgMagazines" >> _usedItem) over the BIS function, I'm a little worried about items of the same class name being in CfgWeapons and CfgMagazines. I'm not sure it's possible though.

LinkIsGrim · 2024-03-04T15:06:29Z

Possible, yes. Common? Not really.

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

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

johnb432 · 2024-03-04T22:13:29Z

Possible, yes. Common? Not really.

Still makes me feel uneasy about this.

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

Stale

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

Co-Authored-By: LinkIsGrim <salluci.lovi@gmail.com>

BrettMayson · 2024-03-16T23:55:53Z

Thanks @johnb432 I haven't had a chance to look at this in a few days

LinkIsGrim

Code LGTM, ingame testing to follow

**When merged this pull request will:** - Chemical is now modular - Surgery is now modular - Pharma is now modular - Create ACE events so that KAM doesn't need to overwrite some files **Semi Related** - Update to support ACE's new maxDoseDeviation Requires: - acemod/ACE3#9813 - acemod/ACE3#9816 Moved from KAM to ACE: - acemod/ACE3#9817 - acemod/ACE3#9815 Currently removed, needs to be added to ACE: - Show inactive status setting for medical_gui ### IMPORTANT - [Development Guidelines](https://ace3.acemod.org/wiki/development/) are read, understood and applied. - Title of this PR uses our standard template `Component - Add|Fix|Improve|Change|Make|Remove {changes}`.

count treatment items

fe4ed52

BrettMayson mentioned this pull request Mar 2, 2024

General - Remove Overwrites KAT-Advanced-Medical/KAM#488

Merged

BrettMayson and others added 3 commits March 1, 2024 19:11

getCountofItem

e88afa6

Co-Authored-By: Blue <itzblueman@gmail.com>

getCountofItem fix

d05bb52

Co-Authored-By: Blue <itzblueman@gmail.com>

convert painkillers to magazine

41eafbc

BrettMayson marked this pull request as ready for review March 3, 2024 04:59

LinkIsGrim reviewed Mar 3, 2024

View reviewed changes

Comment thread addons/medical_treatment/functions/fnc_hasItem.sqf Outdated

Comment thread addons/medical_treatment/CfgWeapons.hpp

Comment thread addons/common/functions/fnc_adjustMagazineAmmo.sqf Outdated

Comment thread addons/common/functions/fnc_adjustMagazineAmmo.sqf Outdated

johnb432 reviewed Mar 3, 2024

View reviewed changes

Comment thread addons/common/functions/fnc_getCountOfItem.sqf Outdated

rautamiekka reviewed Mar 3, 2024

View reviewed changes

Comment thread addons/medical_treatment/functions/fnc_treatmentFailure.sqf Outdated

BrettMayson and others added 4 commits March 3, 2024 17:12

use isclass

936897e

Co-Authored-By: johnb432 <58661205+johnb432@users.noreply.github.com>

forget to change variable

d8cac46

Update addons/medical_treatment/functions/fnc_hasItem.sqf

5c15384

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

better magazine adjustment

65dfa6b

BrettMayson requested a review from LinkIsGrim March 4, 2024 00:46

BrettMayson added this to the 3.17.0 milestone Mar 4, 2024

BrettMayson requested a review from johnb432 March 4, 2024 01:13

LinkIsGrim reviewed Mar 4, 2024

View reviewed changes

Comment thread addons/common/functions/fnc_adjustMagazineAmmo.sqf Outdated

johnb432 previously requested changes Mar 4, 2024

View reviewed changes

BrettMayson and others added 3 commits March 4, 2024 09:34

Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

ef251a4

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

Update addons/medical_treatment/functions/fnc_medication.sqf

5137885

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

Update addons/medical_treatment/functions/fnc_treatmentFailure.sqf

21a6b5b

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

rautamiekka suggested changes Mar 4, 2024

View reviewed changes

Comment thread docs/wiki/framework/arsenal-framework.md Outdated

Update docs/wiki/framework/arsenal-framework.md

81be584

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

LinkIsGrim reviewed Mar 5, 2024

View reviewed changes

Comment thread addons/medical_treatment/functions/fnc_useItem.sqf Outdated

LinkIsGrim reviewed Mar 5, 2024

View reviewed changes

Comment thread addons/medical_gui/functions/fnc_countTreatmentItems.sqf Outdated

Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

a343b38

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

LinkIsGrim reviewed Mar 6, 2024

View reviewed changes

Comment thread addons/common/functions/fnc_adjustMagazineAmmo.sqf Outdated

LinkIsGrim and others added 2 commits March 6, 2024 16:46

Header

ee070a6

use switch statement in fnc_useItem

8a0d64f

johnb432 reviewed Mar 7, 2024

View reviewed changes

Comment thread addons/common/functions/fnc_getCountOfItem.sqf

johnb432 reviewed Mar 7, 2024

View reviewed changes

Comment thread addons/common/functions/fnc_adjustMagazineAmmo.sqf Outdated

Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

601524d

johnb432 reviewed Mar 8, 2024

View reviewed changes

Comment thread addons/common/functions/fnc_adjustMagazineAmmo.sqf Outdated

johnb432 reviewed Mar 10, 2024

View reviewed changes

Comment thread addons/common/functions/fnc_adjustMagazineAmmo.sqf Outdated

BrettMayson and others added 2 commits March 10, 2024 13:21

Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

e488e13

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

only check adding to mags that are not full

a701251

Co-Authored-By: LinkIsGrim <salluci.lovi@gmail.com>

BrettMayson requested a review from johnb432 March 11, 2024 03:44

johnb432 reviewed Mar 11, 2024

View reviewed changes

Comment thread addons/common/functions/fnc_adjustMagazineAmmo.sqf Outdated

johnb432 added 3 commits March 11, 2024 03:16

Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

7709779

Update fnc_getCountOfItem.sqf

cbed198

Optimisations & header fix

c6ebef8

johnb432 requested changes Mar 13, 2024

View reviewed changes

Comment thread addons/common/functions/fnc_uniqueItems.sqf Outdated

johnb432 reviewed Mar 16, 2024

View reviewed changes

Comment thread addons/common/functions/fnc_adjustMagazineAmmo.sqf Outdated

johnb432 added 2 commits March 16, 2024 10:10

Update addons/common/functions/fnc_adjustMagazineAmmo.sqf

f53063d

Fixed vehicle implementation

f5dc797

johnb432 approved these changes Mar 17, 2024

View reviewed changes

johnb432 requested a review from LinkIsGrim March 17, 2024 11:58

jonpas added the kind/feature Release Notes: **ADDED:** label Mar 17, 2024

LinkIsGrim reviewed Mar 21, 2024

View reviewed changes

LinkIsGrim approved these changes Mar 21, 2024

View reviewed changes

johnb432 merged commit 3c5b46c into acemod:master Mar 21, 2024

BrettMayson deleted the magazine_treatment branch March 30, 2024 02:49

Conversation

BrettMayson commented Mar 1, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

IMPORTANT

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

johnb432 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

LinkIsGrim commented Mar 4, 2024

Uh oh!

Uh oh!

johnb432 commented Mar 4, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

BrettMayson commented Mar 16, 2024

Uh oh!

LinkIsGrim left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

BrettMayson commented Mar 1, 2024 •

edited

Loading