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(content): NON_FOULING flag not working due to typo #3655

Merged
merged 2 commits into from
Nov 13, 2023

Conversation

scarf005
Copy link
Member

@scarf005 scarf005 commented Nov 13, 2023

Summary

SUMMARY: Bugfixes "Fix NON_FOULING flag not working due to typo"

Purpose of change

DDA removed their accidental hyphen-based item flags to underscore based ones, BN didn't follow. Thus BN was using NON-FOULING. #3354 introduced NON_FOULING, which made the hardcoded flag look for NON_FOULING.

Describe the solution

search and replace

Describe alternatives you've considered

hecc.

Testing

spawned and fired A7 laser rifle a lot.
before: got fouling
after: got no fouling

@github-actions github-actions bot added src changes related to source code. JSON related to game datas in JSON format. mods PR changes related to mods. labels Nov 13, 2023
@scarf005 scarf005 changed the title fix(content): NON-FOULING -> NON_FOULING fix(content): NON_FOULING flag not working due to typo Nov 13, 2023
@scarf005 scarf005 requested a review from chaosvolt November 13, 2023 06:43
@olanti-p olanti-p added the BREAKING-JSON-CHANGES Changes to JSON data format or features label Nov 13, 2023
@chaosvolt
Copy link
Member

There being two ammo effect defs and both of them having been the hyphen version feels mildly fucking cursed. XD

@scarf005
Copy link
Member Author

@olanti-p should i keep NON_FOULING as both ammo effect and json flag? afaik former is for ammo and latter is for guns

@olanti-p
Copy link
Contributor

It doesn't look like we're using the ammo effect in any meaningful capacity (i.e. all relevant guns that fire these ammo should already have the NON_FOULING flag), but there might be mods that add non-fouling gunpowder-based ammo? Does such combination even work?

Copy link
Member

@chaosvolt chaosvolt left a comment

Choose a reason for hiding this comment

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

Switched to Scarf's repo and slapped it with the search-in-folder stick, NON-FOULING no longer appears anywhere in the data, doc, or src folders. NON_FOULING meanwhile appears in expected areas, though it's presently absent from documentation folder.

Also searched the trio of relevant folders for NONFOULING to really idiotproof things, no hits as expected.

@scarf005 scarf005 added this pull request to the merge queue Nov 13, 2023
Merged via the queue into cataclysmbnteam:upload with commit aa47f05 Nov 13, 2023
scarf005 added a commit to scarf005/Cata-Rogall-Modpack that referenced this pull request Nov 13, 2023
scarf005 added a commit to scarf005/ChorusMod that referenced this pull request Nov 13, 2023
scarf005 added a commit to scarf005/Essence2200 that referenced this pull request Nov 13, 2023
scarf005 added a commit to scarf005/Military_ad.-ed._CBN that referenced this pull request Nov 13, 2023
scarf005 added a commit to scarf005/SzQmod that referenced this pull request Nov 13, 2023
OpsCoretango added a commit to OpsCoretango/Military_ad.-ed._CBN that referenced this pull request Dec 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
BREAKING-JSON-CHANGES Changes to JSON data format or features JSON related to game datas in JSON format. mods PR changes related to mods. src changes related to source code.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Lasers get fouled and can be mended, firing an unlubricated laser crashes to desktop
3 participants