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.

Sign up for GitHub

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

Jump to bottom

Medical - Support Magazine Treatment Items #9816

Merged
merged 23 commits into from Mar 21, 2024
Merged

Medical - Support Magazine Treatment Items #9816

merged 23 commits into from Mar 21, 2024

Conversation

BrettMayson
Copy link
Member

@BrettMayson BrettMayson commented Mar 1, 2024 •
edited

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

@BrettMayson BrettMayson mentioned this pull request Mar 2, 2024
Merged
BrettMayson and others added 3 commits March 1, 2024 19:11
@BrettMayson @BlueTheKing
getCountofItem
e88afa6 
Co-Authored-By: Blue <itzblueman@gmail.com>
@BrettMayson @BlueTheKing
getCountofItem fix
d05bb52 
Co-Authored-By: Blue <itzblueman@gmail.com>
@BrettMayson
convert painkillers to magazine
41eafbc
@BrettMayson BrettMayson marked this pull request as ready for review March 3, 2024 04:59
LinkIsGrim
LinkIsGrim reviewed Mar 3, 2024
View reviewed changes
addons/medical_treatment/functions/fnc_hasItem.sqf Outdated Show resolved Hide resolved
addons/medical_treatment/CfgWeapons.hpp Outdated Show resolved Hide resolved
addons/common/functions/fnc_adjustMagazineAmmo.sqf Outdated Show resolved Hide resolved
addons/common/functions/fnc_adjustMagazineAmmo.sqf Outdated Show resolved Hide resolved
BrettMayson and others added 4 commits March 3, 2024 17:12
@BrettMayson @johnb432
use isclass
936897e 
Co-Authored-By: johnb432 <58661205+johnb432@users.noreply.github.com>
@BrettMayson
forget to change variable
d8cac46
@BrettMayson @LinkIsGrim
Update addons/medical_treatment/functions/fnc_hasItem.sqf
5c15384 
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
@BrettMayson
better magazine adjustment
65dfa6b
@BrettMayson BrettMayson added this to the 3.17.0 milestone Mar 4, 2024
johnb432
johnb432 previously requested changes Mar 4, 2024
View reviewed changes
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.

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.

addons/common/functions/fnc_adjustMagazineAmmo.sqf Outdated Show resolved Hide resolved
addons/common/functions/fnc_adjustMagazineAmmo.sqf Outdated Show resolved Hide resolved
addons/common/functions/fnc_uniqueItems.sqf Outdated Show resolved Hide resolved
addons/common/functions/fnc_uniqueItems.sqf Outdated Show resolved Hide resolved
addons/medical_treatment/functions/fnc_medication.sqf Outdated Show resolved Hide resolved
addons/medical_treatment/functions/fnc_treatmentFailure.sqf Outdated Show resolved Hide resolved
@LinkIsGrim
Copy link
Contributor

Possible, yes. Common? Not really.

BrettMayson and others added 3 commits March 4, 2024 09:34
@BrettMayson @johnb432
Update addons/common/functions/fnc_adjustMagazineAmmo.sqf
ef251a4 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
@BrettMayson @johnb432
Update addons/medical_treatment/functions/fnc_medication.sqf
5137885 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
@BrettMayson @johnb432
Update addons/medical_treatment/functions/fnc_treatmentFailure.sqf
21a6b5b 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
@BrettMayson @rautamiekka
Update docs/wiki/framework/arsenal-framework.md
81be584 
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
@johnb432
Copy link
Contributor

johnb432 commented Mar 4, 2024

Possible, yes. Common? Not really.

Still makes me feel uneasy about this.

@BrettMayson @johnb432
Update addons/common/functions/fnc_adjustMagazineAmmo.sqf
a343b38 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
BrettMayson and others added 2 commits March 10, 2024 13:21
@BrettMayson @johnb432
Update addons/common/functions/fnc_adjustMagazineAmmo.sqf
e488e13 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
@BrettMayson @LinkIsGrim
only check adding to mags that are not full
a701251 
Co-Authored-By: LinkIsGrim <salluci.lovi@gmail.com>
@BrettMayson
Copy link
Member Author

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

@jonpas jonpas added the kind/feature Release Notes: **ADDED:** label Mar 17, 2024
LinkIsGrim
LinkIsGrim reviewed Mar 21, 2024
View reviewed changes
Copy link
Contributor

@LinkIsGrim LinkIsGrim left a comment

Choose a reason for hiding this comment

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

Code LGTM, ingame testing to follow

@johnb432 johnb432 merged commit 3c5b46c into acemod:master Mar 21, 2024
5 checks passed
@BrettMayson BrettMayson deleted the magazine_treatment branch March 30, 2024 02:49
MiszczuZPolski pushed a commit to KAT-Advanced-Medical/KAM that referenced this pull request Apr 1, 2024
@BrettMayson
General - Remove Overwrites (#488)
4f10d52 
**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}`.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rautamiekka rautamiekka rautamiekka requested changes

@johnb432 johnb432 johnb432 approved these changes

@LinkIsGrim LinkIsGrim LinkIsGrim approved these changes

Assignees
No one assigned
Labels
kind/feature Release Notes: **ADDED:**
Projects
None yet
Milestone
3.17.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@BrettMayson @LinkIsGrim @johnb432 @rautamiekka @jonpas