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

Fix integrated armor being incompatible with some mutations #73547

Merged
merged 7 commits into from May 10, 2024

Conversation

KittyTac
Copy link
Contributor

@KittyTac KittyTac commented May 6, 2024

Summary

Bugfixes "Fix integrated armor being incompatible with some mutations"

Purpose of change

#71874 added integrated fangs, but apparently nobody noticed that snouts conflict with them, sometimes not allowing you to get fangs despite having the mutation.

Describe the solution

Make integrated armor act as OVERSIZE by having INTEGRATED skip any checks OVERSIZE does.

Describe alternatives you've considered

N/A

Testing

I don't think testing is needed here honestly, it's literally modifying a few checks in a simple manner.

Additional context

N/A

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Items: Armor / Clothing Armor and clothing <Bugfix> This is a fix for a bug (or closes open issue) astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels May 6, 2024
@Venera3
Copy link
Contributor

Venera3 commented May 6, 2024

Integrated armor shouldn't care about fitting in the first place. The right solution is to disable the janky checks, not add every missing flag (PADDED/NATURAL ATTACKS ALLOWED/OVERSIZE etc) to every integrated item, otherwise it will just become a bug factory.

@KittyTac
Copy link
Contributor Author

KittyTac commented May 6, 2024

Integrated armor shouldn't care about fitting in the first place. The right solution is to disable the janky checks, not add every missing flag (PADDED/NATURAL ATTACKS ALLOWED/OVERSIZE etc) to every integrated item, otherwise it will just become a bug factory.

Yeah I just wasn't sure if something would break in such a case.

I'll get to it in a bit then.

@KittyTac KittyTac marked this pull request as draft May 6, 2024 08:18
@github-actions github-actions bot added [C++] Changes (can be) made in C++. Previously named `Code` and removed astyled astyled PR, label is assigned by github actions labels May 6, 2024
@KittyTac KittyTac marked this pull request as ready for review May 6, 2024 08:34
src/character_attire.cpp Outdated Show resolved Hide resolved
src/iuse_actor.cpp Outdated Show resolved Hide resolved
src/iuse_actor.cpp Outdated Show resolved Hide resolved
@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label May 6, 2024
@KittyTac KittyTac changed the title Make integrated fangs oversize so snouts don't conflict with them Make integrated armor act like oversized armor May 6, 2024
@KittyTac
Copy link
Contributor Author

KittyTac commented May 6, 2024

Should be ready now.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label May 6, 2024
@Maleclypse Maleclypse changed the title Make integrated armor act like oversized armor Remvoe inappropriate checks from Integrated Armor May 6, 2024
@Maleclypse
Copy link
Member

Should be ready now.

I'll wait for Venera to approve the change to the PR but I've adjusted the name of the PR. Please check and see if that works then apply in Summary if you agree.

@Venera3
Copy link
Contributor

Venera3 commented May 6, 2024

Add the bypassed checks to the INTEGRATED flag's documentation as well, please, otherwise looks good.

@KittyTac
Copy link
Contributor Author

KittyTac commented May 6, 2024

Will do tomorrow, it's late here, will ping you both when I do it.

@KittyTac KittyTac changed the title Remvoe inappropriate checks from Integrated Armor Remove inappropriate checks from integrated armor May 6, 2024
@KittyTac
Copy link
Contributor Author

KittyTac commented May 9, 2024

@Venera3 @Maleclypse Sorry I forgot yesterday, doc line is added now.

@github-actions github-actions bot added <Documentation> Design documents, internal info, guides and help. [Markdown] Markdown issues and PRs labels May 9, 2024
@KittyTac KittyTac changed the title Remove inappropriate checks from integrated armor Make integrated armor act as OVERSIZE by having INTEGRATED skip any checks OVERSIZE does May 9, 2024
@KittyTac KittyTac changed the title Make integrated armor act as OVERSIZE by having INTEGRATED skip any checks OVERSIZE does Fix integrated armor being incompatible with some mutations May 9, 2024
@I-am-Erk I-am-Erk merged commit 4edb9dd into CleverRaven:master May 10, 2024
26 of 30 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` <Documentation> Design documents, internal info, guides and help. Items: Armor / Clothing Armor and clothing [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions [Markdown] Markdown issues and PRs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants