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

Unblacklist vanilla medical items from arsenal #7017

Merged
merged 1 commit into from
Jun 9, 2019
Merged

Unblacklist vanilla medical items from arsenal #7017

merged 1 commit into from
Jun 9, 2019

Conversation

kymckay
Copy link
Member

@kymckay kymckay commented May 22, 2019 •
edited
Loading

  • The replacement setting may be disabled so we shouldn't prevent their addition
  • If it isn't, they will be replaced with suitable items which is fine (and someone may want to design a mission that works either way)

@kymckay kymckay added this to the Medical Rewrite milestone May 22, 2019
@kymckay kymckay changed the title Medical replace items Allow addon medical items to be replaced May 22, 2019
@kymckay
Copy link
Member Author

kymckay commented May 23, 2019

It did come to attention that this is already implemented in #6933

I'm not sure which implementation is preferable so will leave this open for now (there are also some minor changes here we should port over there if we go with that one).

@kymckay
Copy link
Member Author

kymckay commented May 23, 2019

Looking at the other implementation I expect it should be faster because there aren't calls to the CBA hash functions.

@dedmen
Copy link
Contributor

dedmen commented May 23, 2019

There are also less calls in the other impl and it fixes my comments too.
Well doesn't need compileFinal as it's in preInit, which is fine too. Not big enough to benefit from preStart

@kymckay kymckay mentioned this pull request May 28, 2019
Merged
@PabstMirror
Copy link
Contributor

6933 merged, but we still may want to intergrate parts of this PR
ref: #6933 (comment)

@kymckay
Unblacklist vanilla medical items from arsenal
b96a972 
- The replacement setting may be disabled so we shouldn't prevent their
addition
- If it isn't, they will be replaced with suitable items which is fine
(and someone may want to design a mission that works either way)
@kymckay kymckay changed the title Allow addon medical items to be replaced Unblacklist vanilla medical items from arsenal Jun 9, 2019
@kymckay kymckay removed area/compatibility kind/enhancement Release Notes: **IMPROVED:** labels Jun 9, 2019
@mharis001 mharis001 merged commit aff2cea into master Jun 9, 2019
@mharis001 mharis001 deleted the medical-replace-items branch June 9, 2019 12:17
BaerMitUmlaut pushed a commit that referenced this pull request Aug 5, 2019
@kymckay @mharis001
Unblacklist vanilla medical items from arsenal (#7017)
f6b1ea6 
- The replacement setting may be disabled so we shouldn't prevent their
addition
- If it isn't, they will be replaced with suitable items which is fine
(and someone may want to design a mission that works either way)
@PabstMirror PabstMirror modified the milestones: Medical Rewrite, 3.13.0, 3.13.0-temp2 Dec 30, 2019
@PabstMirror PabstMirror added this to the 3.13.0 milestone Dec 30, 2019
@LinkIsGrim LinkIsGrim mentioned this pull request Jan 16, 2022
Closed
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonpas jonpas jonpas left review comments

@dedmen dedmen dedmen left review comments

@mharis001 mharis001 mharis001 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
ACE3 Medical Focus Feature
Status: Completed
Milestone
3.13.0
Development

Successfully merging this pull request may close these issues.
5 participants
@kymckay @dedmen @PabstMirror @jonpas @mharis001