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

Included new weather 'Rain Storm' and appropriate sound category. #59022

Merged
merged 5 commits into from
Sep 27, 2022

Conversation

L-3-on
Copy link
Contributor

@L-3-on L-3-on commented Jul 6, 2022

Summary

Content "Includes new type of weather 'Rain Storm' and sound category therefor"

Purpose of change

Adds a weather type similar to "Snowstorm" with a condition of windpower >= 15 but a temperature >= 33. Also integrating a separate sound category "rainstorm" it would be possible to improve sound packs with special audio file for that situations where there's a gale blowing and it's pouring.

Describe the solution

I searched the source files for all references of "Thunder", "WEATHER_THUNDER" and "outdoors_thunderstorm_env". After that, I took the following steps:

  1. Added a class definition in "sounds.h" for the rainstorm channel
  2. Expanded the audio channel check in "sound.cpp"
  3. Included a new section for "Rain Storm" to all translation files
  4. Added the weather type "rainstorm" to the "weather_type.json" file
  5. Expanded the list of weather types to use in "regional_map_settings.json"
  6. Improved documentation in "SOUNDPACKS.md" and "sound.h"

Describe alternatives you've considered


Testing

Well, tbh. I have a bit of programing knowledge but never worked with C++ and MS Visual Studio so I simply couldn't figure out how to compile the source files. I therefore testetd the changes only the new weather type without a special audio channel definition: I included the "rainstorm" definition in "weather_type.json" and the new weather type to the "regional_map_settings.json". Those got loaded in the current experimental db8eb88 (tiles) without any problems and got used ingame without errors.

Additional context


@L-3-on L-3-on requested a review from BrettDong as a code owner July 6, 2022 18:02
@github-actions github-actions bot added <Documentation> Design documents, internal info, guides and help. [C++] Changes (can be) made in C++. Previously named `Code` [JSON] Changes (can be) made in JSON [Markdown] Markdown issues and PRs Mechanics: Weather Rain, snow, portal storms and non-temperature environment Translation I18n labels Jul 6, 2022
@L-3-on
Copy link
Contributor Author

L-3-on commented Jul 6, 2022

Btw. I included new sections to all translation files, but I didn't include translations for those languages!

@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Jul 7, 2022
@BrettDong
Copy link
Member

Files in lang/po directory are managed by bots and must not be edited by human. You need to revert these changes.

lang/po/ar.po Outdated Show resolved Hide resolved
lang/po/cs.po Outdated Show resolved Hide resolved
lang/po/da.po Outdated Show resolved Hide resolved
lang/po/de.po Outdated Show resolved Hide resolved
lang/po/el.po Outdated Show resolved Hide resolved
lang/po/es_AR.po Outdated Show resolved Hide resolved
lang/po/es_ES.po Outdated Show resolved Hide resolved
lang/po/fil_PH.po Outdated Show resolved Hide resolved
lang/po/fr.po Outdated Show resolved Hide resolved
lang/po/ga_IE.po Outdated Show resolved Hide resolved
lang/po/hu.po Outdated Show resolved Hide resolved
lang/po/it_IT.po Outdated Show resolved Hide resolved
lang/po/ja.po Outdated Show resolved Hide resolved
lang/po/ko.po Outdated Show resolved Hide resolved
lang/po/nb.po Outdated Show resolved Hide resolved
lang/po/nl.po Outdated Show resolved Hide resolved
lang/po/pl.po Outdated Show resolved Hide resolved
lang/po/pt_BR.po Outdated Show resolved Hide resolved
lang/po/ro.po Outdated Show resolved Hide resolved
lang/po/ru.po Outdated Show resolved Hide resolved
lang/po/sr.po Outdated Show resolved Hide resolved
lang/po/tr.po Outdated Show resolved Hide resolved
lang/po/uk_UA.po Outdated Show resolved Hide resolved
lang/po/zh_CN.po Outdated Show resolved Hide resolved
lang/po/zh_TW.po Outdated Show resolved Hide resolved
lang/po/ar.po Outdated Show resolved Hide resolved
lang/po/id.po Outdated Show resolved Hide resolved
lang/po/is.po Outdated Show resolved Hide resolved
@stale
Copy link

stale bot commented Aug 13, 2022

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. Please do not 'bump' or comment on this issue unless you are actively working on it. Stale issues, and stale issues that are closed are still considered.

@stale stale bot added the stale Closed for lack of activity, but still valid. label Aug 13, 2022
@github-actions github-actions bot added <Bugfix> This is a fix for a bug (or closes open issue) astyled astyled PR, label is assigned by github actions labels Sep 25, 2022
@stale stale bot removed the stale Closed for lack of activity, but still valid. label Sep 25, 2022
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Sep 26, 2022
@dseguin dseguin merged commit 5e94c7c into CleverRaven:master Sep 27, 2022
captainego pushed a commit to captainego/Cataclysm-DDA that referenced this pull request Oct 9, 2022
…everRaven#59022)

* Included new weather 'Rain Storm' and appropriate sound category.

* Fixed a mistake and set "rains" to 'true'.

* Fix my mess

* Fix missing def

Co-authored-by: L-3-on <louis.esswein@gmx.de>
captainego pushed a commit to captainego/Cataclysm-DDA that referenced this pull request Oct 9, 2022
…everRaven#59022)

* Included new weather 'Rain Storm' and appropriate sound category.

* Fixed a mistake and set "rains" to 'true'.

* Fix my mess

* Fix missing def

Co-authored-by: L-3-on <louis.esswein@gmx.de>
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. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions [Markdown] Markdown issues and PRs Mechanics: Weather Rain, snow, portal storms and non-temperature environment Translation I18n
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants