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

Convert audio .cfg files to JSON #3722

Merged
merged 2 commits into from
Apr 4, 2024
Merged

Convert audio .cfg files to JSON #3722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
495e12d
Convert audio .cfg files to JSON
KJeff01 Mar 31, 2024
f87264f
Reorder keys; Allow format comment to be on its own
KJeff01 Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
475 changes: 0 additions & 475 deletions data/base/audio/audio.cfg
View file
Open in desktop

This file was deleted.

520 changes: 520 additions & 0 deletions data/base/audio/audio.json
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 0 additions & 15 deletions data/base/audio/frontaud.cfg
View file
Open in desktop

This file was deleted.

25 changes: 25 additions & 0 deletions data/base/audio/frontaud.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"_Format": {
"_comment": "fileName: [file.ogg], loop: [false/true], range: [world units, 128 = 1 tile], volume: [0-100]"
},
"Beeps": {
"_name": "Beep sounds",
"data": [
{ "fileName": "beep1.ogg", "loop": false, "range": 1800, "volume": 30 },
{ "fileName": "beep2.ogg", "loop": false, "range": 1800, "volume": 30 },
{ "fileName": "beep3.ogg", "loop": false, "range": 1800, "volume": 30 },
{ "fileName": "beep4.ogg", "loop": false, "range": 1800, "volume": 30 },
{ "fileName": "beep5.ogg", "loop": false, "range": 1800, "volume": 30 },
{ "fileName": "beep6.ogg", "loop": false, "range": 1800, "volume": 30 },
{ "fileName": "beep7.ogg", "loop": false, "range": 1800, "volume": 30 },
{ "fileName": "beep8.ogg", "loop": false, "range": 1800, "volume": 30 },
{ "fileName": "beep9.ogg", "loop": false, "range": 1800, "volume": 30 }
]
},
"Shutdown": {
"_name": "Shutdown sounds",
"data": [
{ "fileName": "gmeshtdn.ogg", "loop": false, "range": 1800, "volume": 30 }
]
}
}
4 changes: 2 additions & 2 deletions data/base/wrf/audio.wrf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/***********************************************************/
/* You may have to modify this file for it to be correct! */
/* You may have to modify this file for it to be correct! */
/******************* WRF\audio.wrf *******************/


Expand Down Expand Up @@ -391,4 +391,4 @@ file WAV "uplink.ogg"
file WAV "lasstrk.ogg"
file WAV "beacon.ogg"
directory "audio"
file AUDIOCFG "audio.cfg"
file AUDIOCFG "audio.json"
4 changes: 2 additions & 2 deletions data/base/wrf/frontend.wrf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/***********************************************************/
/* You may have to modify this file for it to be correct! */
/* You may have to modify this file for it to be correct! */
/******************* WRF\frontend.wrf *******************/


Expand All @@ -18,6 +18,6 @@ file WAV "beep8.ogg"
file WAV "beep9.ogg"
file WAV "gmeshtdn.ogg"
directory "audio"
file AUDIOCFG "frontaud.cfg"
file AUDIOCFG "frontaud.json"
directory "messages/strings"
file STR_RES "names.txt"
Loading
Loading