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

Add previously missing json-loading of desc_freq in music instruments #40253

Merged

Conversation

RedShakespeare
Copy link
Contributor

@RedShakespeare RedShakespeare commented May 6, 2020

Summary

SUMMARY: Bugfixes "Fixes loading of desc_freq in music instruments"

Purpose of change

The attribute "description_frequency" in music_instrument didn't load from json files at all in the past versions, which made descriptions of playing the instruments never appear in game---Tried to fix this.

Describe the solution

The previous author seemed to forget the loading step before checking existence, so I add this step back.

Describe alternatives you've considered

No....?Actually I'm not quite sure whether the existence examination should remain there or not.

Testing

Should work in theory...

@ZhilkinSerg ZhilkinSerg added <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` Items / Item Actions / Item Qualities Items and how they work and interact labels May 6, 2020
@RedShakespeare RedShakespeare changed the title Fixes loading of desc_freq in music instruments Add previously missing json-loading of desc_freq in music instruments May 7, 2020
@RedShakespeare
Copy link
Contributor Author

Have rewritten the pr description.

@Rivet-the-Zombie Rivet-the-Zombie merged commit 1786e61 into CleverRaven:master May 8, 2020
fengjixuchui added a commit to fengjixuchui/Cataclysm-DDA that referenced this pull request May 8, 2020
Merge pull request CleverRaven#40253 from RedShakespeare/music_instru…
@RedShakespeare RedShakespeare deleted the music_instrument branch May 8, 2020 06:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
<Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` Items / Item Actions / Item Qualities Items and how they work and interact
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants