cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 21:12:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Further Ambience Tweaks (#14716)

Browse Source
This commit is contained in:
SleepyGemmy
2022-09-11 20:45:30 +02:00
committed by GitHub
parent 1fe1d1020f
commit bf3a6b5119
14 changed files with 136 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/global/02_settings.dm
+6 -6
View File
@@ -6,7 +6,7 @@
S["lastchangelog"] >> pref.lastchangelog
S["default_slot"] >> pref.default_slot
S["toggles"] >> pref.toggles
S["asfx_togs"] >> pref.asfx_togs
S["sfx_toggles"] >> pref.sfx_toggles
S["motd_hash"] >> pref.motd_hash
S["memo_hash"] >> pref.memo_hash
S["toggles_secondary"] >> pref.toggles_secondary
@@ -15,7 +15,7 @@
S["lastchangelog"] << pref.lastchangelog
S["default_slot"] << pref.default_slot
S["toggles"] << pref.toggles
S["asfx_togs"] << pref.asfx_togs
S["sfx_toggles"] << pref.sfx_toggles
S["motd_hash"] << pref.motd_hash
S["memo_hash"] << pref.memo_hash
S["toggles_secondary"] << pref.toggles_secondary
@@ -27,7 +27,7 @@
"lastchangelog",
"current_character",
"toggles",
"asfx_togs",
"sfx_toggles",
"lastmotd" = "motd_hash",
"lastmemo" = "memo_hash",
"toggles_secondary"
@@ -45,7 +45,7 @@
"lastchangelog",
"current_character",
"toggles",
"asfx_togs",
"sfx_toggles",
"lastmotd",
"lastmemo",
"ckey" = 1,
@@ -59,7 +59,7 @@
"lastchangelog" = pref.lastchangelog,
"current_character" = pref.current_character,
"toggles" = pref.toggles,
"asfx_togs" = pref.asfx_togs,
"sfx_toggles" = pref.sfx_toggles,
"lastmotd" = pref.motd_hash,
"lastmemo" = pref.memo_hash,
"toggles_secondary" = pref.toggles_secondary
@@ -73,7 +73,7 @@
pref.lastchangelog = sanitize_text(pref.lastchangelog, initial(pref.lastchangelog))
pref.default_slot = sanitize_integer(text2num(pref.default_slot), 1, config.character_slots, initial(pref.default_slot))
pref.toggles = sanitize_integer(text2num(pref.toggles), 0, BITFIELDMAX, initial(pref.toggles))
pref.asfx_togs = sanitize_integer(text2num(pref.asfx_togs), 0, BITFIELDMAX, initial(pref.toggles))
pref.sfx_toggles = sanitize_integer(text2num(pref.sfx_toggles), 0, BITFIELDMAX, initial(pref.toggles))
pref.motd_hash = sanitize_text(pref.motd_hash, initial(pref.motd_hash))
pref.memo_hash = sanitize_text(pref.memo_hash, initial(pref.memo_hash))
pref.toggles_secondary = sanitize_integer(text2num(pref.toggles_secondary), 0, BITFIELDMAX, initial(pref.toggles_secondary))
code/modules/client/preferences.dm
+1 -1
View File
@@ -23,7 +23,7 @@ datum/preferences
var/list/be_special_role = list() //Special role selection
var/UI_style = "Midnight"
var/toggles = TOGGLES_DEFAULT
var/asfx_togs = ASFX_DEFAULT
var/sfx_toggles = ASFX_DEFAULT
var/UI_style_color = "#ffffff"
var/UI_style_alpha = 255
var/html_UI_style = "Nano"
code/modules/client/preferences_ambience.dm
+42 -26
View File
@@ -1,5 +1,13 @@
//
// ASFX Toggles
//
// Ambience plays on channel 2.
// Ambient hum plays on channel 3.
// Music plays on channel 4.
// ASFX Toggles List
/var/global/asfx_togs = list(
/var/global/sfx_toggles = list(
/client/proc/toggle_footsteps,
/client/proc/toggle_asfx_vote,
/client/proc/toggle_messagesounds,
@@ -15,40 +23,48 @@
set category = "Preferences"
set desc = "Toggle the SFX preferences tab"
verbs ^= asfx_togs
verbs ^= sfx_toggles
return
//
// ASFX Toggles
//
// Ambience Toggle
/client/verb/toggle_asfx()
set name = "Toggle Ambience SFX"
set category = "Preferences"
set desc = "Toggles hearing ambient sound effects"
prefs.asfx_togs ^= ASFX_AMBIENCE
prefs.sfx_toggles ^= ASFX_AMBIENCE
prefs.save_preferences()
if(prefs.asfx_togs & ASFX_AMBIENCE)
if(prefs.sfx_toggles & ASFX_AMBIENCE)
to_chat(src, SPAN_INFO("You will now hear ambient sounds."))
else
to_chat(src, SPAN_INFO("You will no longer hear ambient sounds."))
src << sound(null, repeat = 0, wait = 0, volume = 0, channel = 1) // Ambience plays on channel 1.
src << sound(null, repeat = 0, wait = 0, volume = 0, channel = 2) // Ambience plays on channel 2.
// Ambient Hum Toggle
/client/verb/toggle_asfx_hum()
set name = "Toggle Ambient Hum SFX"
set category = "Preferences"
set desc = "Toggles hearing the ambient hum sound effect"
prefs.asfx_togs ^= ASFX_HUM
prefs.sfx_toggles ^= ASFX_HUM
prefs.save_preferences()
if(prefs.asfx_togs & ASFX_HUM)
if(prefs.sfx_toggles & ASFX_HUM)
to_chat(src, SPAN_INFO("You will now hear the ambient hum sound."))
else
to_chat(src, SPAN_INFO("You will no longer hear the ambient hum sound."))
src << sound(null, repeat = 0, wait = 0, volume = 0, channel = 2) // Ambient hum plays on channel 2.
src << sound(null, repeat = 0, wait = 0, volume = 0, channel = 3) // Ambient hum plays on channel 3.
ambient_hum_playing = FALSE
/client/verb/toggle_sfx_music()
set name = "Toggle Music SFX"
set category = "Preferences"
set desc = "Toggles hearing music"
prefs.sfx_toggles ^= ASFX_MUSIC
prefs.save_preferences()
src << sound(null, repeat = 0, wait = 0, volume = 0, channel = 4) // Music plays on channel 4.
to_chat(src, SPAN_INFO("You will [(prefs.sfx_toggles & ASFX_MUSIC) ? "now" : "no longer"] hear music (such as from jukeboxes)."))
//
// SFX Toggles
//
@@ -58,60 +74,60 @@
set category = "SFX Preferences"
set desc = "Toggles hearing footstep sound effects"
prefs.asfx_togs ^= ASFX_FOOTSTEPS
prefs.sfx_toggles ^= ASFX_FOOTSTEPS
prefs.save_preferences()
to_chat(src, SPAN_INFO("You will [(prefs.asfx_togs & ASFX_FOOTSTEPS) ? "now" : "no longer"] hear footstep sounds."))
to_chat(src, SPAN_INFO("You will [(prefs.sfx_toggles & ASFX_FOOTSTEPS) ? "now" : "no longer"] hear footstep sounds."))
/client/proc/toggle_asfx_vote()
set name = "Toggle Vote Alarm SFX"
set category = "SFX Preferences"
set desc = "Toggles hearing of the vote alarm"
prefs.asfx_togs ^= ASFX_VOTE
prefs.sfx_toggles ^= ASFX_VOTE
prefs.save_preferences()
to_chat(src, SPAN_INFO("You will [(prefs.asfx_togs & ASFX_VOTE) ? "now" : "no longer"] hear the vote alarm."))
to_chat(src, SPAN_INFO("You will [(prefs.sfx_toggles & ASFX_VOTE) ? "now" : "no longer"] hear the vote alarm."))
/client/proc/toggle_messagesounds()
set name = "Toggle Message SFX"
set category = "SFX Preferences"
set desc = "Toggles the message sounds"
prefs.asfx_togs ^= ASFX_VOX
prefs.sfx_toggles ^= ASFX_VOX
prefs.save_preferences()
to_chat(src, SPAN_INFO("You will [(prefs.asfx_togs & ASFX_VOX) ? "now" : "no longer"] hear chat voices."))
to_chat(src, SPAN_INFO("You will [(prefs.sfx_toggles & ASFX_VOX) ? "now" : "no longer"] hear chat voices."))
/client/proc/toggle_dropsounds()
set name = "Toggle Item Dropping SFX"
set category = "SFX Preferences"
set desc = "Toggles hearing dropping and throwing sound effects"
prefs.asfx_togs ^= ASFX_DROPSOUND
prefs.sfx_toggles ^= ASFX_DROPSOUND
prefs.save_preferences()
to_chat(src, SPAN_INFO("You will [(prefs.asfx_togs & ASFX_DROPSOUND) ? "now" : "no longer"] hear dropping and throwing sounds."))
to_chat(src, SPAN_INFO("You will [(prefs.sfx_toggles & ASFX_DROPSOUND) ? "now" : "no longer"] hear dropping and throwing sounds."))
/client/proc/toggle_arcadesounds()
set name = "Toggle Arcade SFX"
set category = "SFX Preferences"
set desc = "Toggles hearing noises made by arcades"
prefs.asfx_togs ^= ASFX_ARCADE
prefs.sfx_toggles ^= ASFX_ARCADE
prefs.save_preferences()
to_chat(src, SPAN_INFO("You will [(prefs.asfx_togs & ASFX_ARCADE) ? "now" : "no longer"] hear arcade sounds."))
to_chat(src, SPAN_INFO("You will [(prefs.sfx_toggles & ASFX_ARCADE) ? "now" : "no longer"] hear arcade sounds."))
/client/proc/toggle_radiosounds()
set name = "Toggle Radio SFX"
set category = "SFX Preferences"
set desc = "Toggles hearing noises made by radios"
prefs.asfx_togs ^= ASFX_RADIO
prefs.sfx_toggles ^= ASFX_RADIO
prefs.save_preferences()
to_chat(src, SPAN_INFO("You will [(prefs.asfx_togs & ASFX_RADIO) ? "now" : "no longer"] hear radio sounds."))
to_chat(src, SPAN_INFO("You will [(prefs.sfx_toggles & ASFX_RADIO) ? "now" : "no longer"] hear radio sounds."))
/client/proc/toggle_instrumentsounds()
set name = "Toggle Instrument SFX"
set category = "SFX Preferences"
set desc = "Toggles hearing noises made by instruments"
prefs.asfx_togs ^= ASFX_INSTRUMENT
prefs.sfx_toggles ^= ASFX_INSTRUMENT
prefs.save_preferences()
to_chat(src, SPAN_INFO("You will [(prefs.asfx_togs & ASFX_INSTRUMENT) ? "now" : "no longer"] hear instrument sounds."))
to_chat(src, SPAN_INFO("You will [(prefs.sfx_toggles & ASFX_INSTRUMENT) ? "now" : "no longer"] hear instrument sounds."))