Skip to content

Commit

Permalink
resources: switch audio container from .ogg to .webm (#3549)
Browse files Browse the repository at this point in the history
  • Loading branch information
marzent committed Oct 16, 2021
1 parent 3b6a588 commit 5176427
Show file tree
Hide file tree
Showing 51 changed files with 26 additions and 25 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Expand Up @@ -4,6 +4,7 @@
*.ogg binary
*.mp3 binary
*.wav binary
*.webm binary

# Set the language for these files to jsonc to ensure GitHub doesn't show the comments as errors
.vscode/*.json linguist-language=jsonc
Expand Down
Binary file removed resources/sounds/BigWigs/Alarm.ogg
Binary file not shown.
Binary file added resources/sounds/BigWigs/Alarm.webm
Binary file not shown.
Binary file removed resources/sounds/BigWigs/Alert.ogg
Binary file not shown.
Binary file added resources/sounds/BigWigs/Alert.webm
Binary file not shown.
Binary file not shown.
Binary file removed resources/sounds/BigWigs/Long.ogg
Binary file not shown.
Binary file added resources/sounds/BigWigs/Long.webm
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed resources/sounds/Overwatch/D.Va_-_Game_on.ogg
Binary file not shown.
Binary file added resources/sounds/Overwatch/D.Va_-_Game_on.webm
Binary file not shown.
Binary file removed resources/sounds/Overwatch/Hanzo_-_Sake.ogg
Binary file not shown.
Binary file added resources/sounds/Overwatch/Hanzo_-_Sake.webm
Binary file not shown.
Binary file removed resources/sounds/Overwatch/Reaper_-_Die_die_die.ogg
Binary file not shown.
Binary file not shown.
12 changes: 6 additions & 6 deletions resources/sounds/freesound/LICENSE.txt
@@ -1,8 +1,8 @@
These sounds from freesound.org and licensed via Creative Commons licenses.
The details of each license along with source for each sound is listed below.
All sounds have been converted from .wav to .ogg for space.
All sounds have been converted from .wav to .webm for space.

alarm.ogg
alarm.webm
https://freesound.org/people/ZyryTSounds/sounds/219244/
http://creativecommons.org/publicdomain/zero/1.0/
modifications: shortened to first second
Expand All @@ -12,18 +12,18 @@ amy/
https://creativecommons.org/licenses/by-nc/3.0/
modifications: sound cut into separate files

percussion_hit.ogg
percussion_hit.webm
https://freesound.org/people/Stumber/sounds/207863/
https://creativecommons.org/publicdomain/zero/1.0/

power_up.ogg
power_up.webm
https://freesound.org/people/GameAudio/sounds/220173/
https://creativecommons.org/publicdomain/zero/1.0/

sonar.ogg
sonar.webm
https://freesound.org/people/NoiseCollector/sounds/6164/
https://creativecommons.org/licenses/by/3.0/

water_drop.ogg
water_drop.webm
https://freesound.org/people/paespedro/sounds/174718/
https://creativecommons.org/publicdomain/zero/1.0/
Binary file removed resources/sounds/freesound/alarm.ogg
Binary file not shown.
Binary file added resources/sounds/freesound/alarm.webm
Binary file not shown.
Binary file removed resources/sounds/freesound/amy/1.ogg
Binary file not shown.
Binary file added resources/sounds/freesound/amy/1.webm
Binary file not shown.
Binary file removed resources/sounds/freesound/amy/10.ogg
Binary file not shown.
Binary file added resources/sounds/freesound/amy/10.webm
Binary file not shown.
Binary file removed resources/sounds/freesound/amy/2.ogg
Binary file not shown.
Binary file added resources/sounds/freesound/amy/2.webm
Binary file not shown.
Binary file removed resources/sounds/freesound/amy/3.ogg
Binary file not shown.
Binary file added resources/sounds/freesound/amy/3.webm
Binary file not shown.
Binary file removed resources/sounds/freesound/amy/4.ogg
Binary file not shown.
Binary file added resources/sounds/freesound/amy/4.webm
Binary file not shown.
Binary file removed resources/sounds/freesound/amy/5.ogg
Binary file not shown.
Binary file added resources/sounds/freesound/amy/5.webm
Binary file not shown.
Binary file removed resources/sounds/freesound/amy/6.ogg
Binary file not shown.
Binary file added resources/sounds/freesound/amy/6.webm
Binary file not shown.
Binary file removed resources/sounds/freesound/amy/7.ogg
Binary file not shown.
Binary file added resources/sounds/freesound/amy/7.webm
Binary file not shown.
Binary file removed resources/sounds/freesound/amy/8.ogg
Binary file not shown.
Binary file added resources/sounds/freesound/amy/8.webm
Binary file not shown.
Binary file removed resources/sounds/freesound/amy/9.ogg
Binary file not shown.
Binary file added resources/sounds/freesound/amy/9.webm
Binary file not shown.
Binary file removed resources/sounds/freesound/percussion_hit.ogg
Binary file not shown.
Binary file added resources/sounds/freesound/percussion_hit.webm
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
6 changes: 3 additions & 3 deletions ui/eureka/eureka.ts
Expand Up @@ -137,9 +137,9 @@ export interface EurekaOptions extends BaseOptions, EurekaConfigOptions {
const defaultOptions: EurekaOptions = {
...UserConfig.getDefaultBaseOptions(),
...defaultEurekaConfigOptions,
PopSound: '../../resources/sounds/freesound/sonar.ogg',
BunnyPopSound: '../../resources/sounds/freesound/water_drop.ogg',
CriticalPopSound: '../../resources/sounds/freesound/sonar.ogg',
PopSound: '../../resources/sounds/freesound/sonar.webm',
BunnyPopSound: '../../resources/sounds/freesound/water_drop.webm',
CriticalPopSound: '../../resources/sounds/freesound/sonar.webm',
timeStrings: timeStrings,
Regex: {
// de, fr, ja languages all share the English regexes here.
Expand Down
6 changes: 3 additions & 3 deletions ui/jobs/jobs.js
Expand Up @@ -514,7 +514,7 @@ class Bars {
}

playNotification() {
const audio = new Audio('../../resources/sounds/freesound/alarm.ogg');
const audio = new Audio('../../resources/sounds/freesound/alarm.webm');
audio.volume = 0.3;
void audio.play();
}
Expand Down Expand Up @@ -697,7 +697,7 @@ class Bars {
this.gpAlarmReady = true;
} else if (this.gpAlarmReady && !this.gpPotion && this.gp >= this.options.GpAlarmPoint) {
this.gpAlarmReady = false;
const audio = new Audio('../../resources/sounds/freesound/power_up.ogg');
const audio = new Audio('../../resources/sounds/freesound/power_up.webm');
audio.volume = this.options.GpAlarmSoundVolume;
void audio.play();
}
Expand Down Expand Up @@ -820,7 +820,7 @@ class Bars {
if (inCountdown !== showingCountdown) {
this.o.pullCountdown.duration = seconds;
if (inCountdown && this.options.PlayCountdownSound) {
const audio = new Audio('../../resources/sounds/freesound/sonar.ogg');
const audio = new Audio('../../resources/sounds/freesound/sonar.webm');
audio.volume = 0.3;
void audio.play();
}
Expand Down
2 changes: 1 addition & 1 deletion ui/radar/radar.ts
Expand Up @@ -67,7 +67,7 @@ type Monster = {
const defaultOptions: RadarOptions = {
...UserConfig.getDefaultBaseOptions(),
...defaultRadarConfigOptions,
PopSound: '../../resources/sounds/freesound/sonar.ogg',
PopSound: '../../resources/sounds/freesound/sonar.webm',
RankOptions: {
'S': {
Type: 'mob',
Expand Down
2 changes: 1 addition & 1 deletion ui/raidboss/data/00-misc/general.ts
Expand Up @@ -201,7 +201,7 @@ const triggerSet: TriggerSet<Data> = {
netRegexJa: NetRegexes.gameLog({ line: '(?:\\y{Name}が)?レディチェックを開始しました。.*?', capture: false }),
netRegexCn: NetRegexes.gameLog({ line: '\\y{Name}?发起了准备确认.*?', capture: false }),
netRegexKo: NetRegexes.gameLog({ line: '\\y{Name} 님이 준비 확인을 시작했습니다\.|준비 확인을 시작합니다\..*?', capture: false }),
sound: '../../resources/sounds/Overwatch/D.Va_-_Game_on.ogg',
sound: '../../resources/sounds/Overwatch/D.Va_-_Game_on.webm',
soundVolume: 0.6,
},
],
Expand Down
2 changes: 1 addition & 1 deletion ui/raidboss/data/00-misc/test.ts
Expand Up @@ -214,7 +214,7 @@ const triggerSet: TriggerSet<Data> = {
netRegexJa: NetRegexes.gameNameLog({ line: '.*は木人に拍手した.*?', capture: false }),
netRegexCn: NetRegexes.gameNameLog({ line: '.*向木人送上掌声.*?', capture: false }),
netRegexKo: NetRegexes.gameNameLog({ line: '.*나무인형에게 박수를 보냅니다.*?', capture: false }),
sound: '../../resources/sounds/freesound/power_up.ogg',
sound: '../../resources/sounds/freesound/power_up.webm',
soundVolume: 0.3,
tts: (_data, _matches, output) => output.text!(),
outputStrings: {
Expand Down
10 changes: 5 additions & 5 deletions ui/raidboss/raidboss_options.ts
Expand Up @@ -53,11 +53,11 @@ type RaidbossNonConfigOptions = {
const defaultRaidbossNonConfigOptions: RaidbossNonConfigOptions = {
PlayerNicks: {},

InfoSound: '../../resources/sounds/freesound/percussion_hit.ogg',
AlertSound: '../../resources/sounds/BigWigs/Alert.ogg',
AlarmSound: '../../resources/sounds/BigWigs/Alarm.ogg',
LongSound: '../../resources/sounds/BigWigs/Long.ogg',
PullSound: '../../resources/sounds/freesound/sonar.ogg',
InfoSound: '../../resources/sounds/freesound/percussion_hit.webm',
AlertSound: '../../resources/sounds/BigWigs/Alert.webm',
AlarmSound: '../../resources/sounds/BigWigs/Alarm.webm',
LongSound: '../../resources/sounds/BigWigs/Long.webm',
PullSound: '../../resources/sounds/freesound/sonar.webm',

AudioAllowed: true,

Expand Down
10 changes: 5 additions & 5 deletions user/raidboss-example.js
Expand Up @@ -8,22 +8,22 @@

// Path to sound played for info-priority text popups, or when "Info" is
// specified as the sound name.
Options.InfoSound = '../../resources/sounds/freesound/percussion_hit.ogg';
Options.InfoSound = '../../resources/sounds/freesound/percussion_hit.webm';

// Path to sound played for alert-priority text popups, or when "Alert" is
// specified as the sound name.
Options.AlertSound = '../../resources/sounds/BigWigs/Alert.ogg';
Options.AlertSound = '../../resources/sounds/BigWigs/Alert.webm';

// Path to sound played for alarm-priority text popups, or when "Alarm" is
// specified as the sound name.
Options.AlarmSound = '../../resources/sounds/BigWigs/Alarm.ogg';
Options.AlarmSound = '../../resources/sounds/BigWigs/Alarm.webm';

// Path to sound played when "Long" is specified as the sound name.
Options.LongSound = '../../resources/sounds/BigWigs/Long.ogg';
Options.LongSound = '../../resources/sounds/BigWigs/Long.webm';

// Path to sound played when the fight starts, or when "Pull" is
// specified as the sound name.
Options.PullSound = '../../resources/sounds/freesound/sonar.ogg';
Options.PullSound = '../../resources/sounds/freesound/sonar.webm';

// A set of nicknames to use for players, when trying to shorten names.
// See: https://github.com/quisquous/cactbot/blob/main/docs/CactbotCustomization.md#customizing-behavior
Expand Down

0 comments on commit 5176427

Please sign in to comment.