From 6aae719915f10614f5d14b2754b476ccc8bd5629 Mon Sep 17 00:00:00 2001 From: macher Date: Wed, 16 Oct 2024 23:44:31 +0800 Subject: [PATCH] more cleaning up --- modular_doppler/dopplerboop/dopplerboops.dm | 5 ++--- .../preferences/middleware/dopplerboops.dm | 4 ++-- .../features/character_preferences/doppler/voice.tsx | 10 ++-------- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/modular_doppler/dopplerboop/dopplerboops.dm b/modular_doppler/dopplerboop/dopplerboops.dm index 8b29e23f98eec..87c9717ae08b4 100644 --- a/modular_doppler/dopplerboop/dopplerboops.dm +++ b/modular_doppler/dopplerboop/dopplerboops.dm @@ -5,7 +5,7 @@ * Currently the sound file must be passed as a sound datum. This was initially with the intention of using BYOND's in-built pitch on sound datums, but that sucks and has a bunch of weird issues. It does have the added benefit * of giving a check to make sure we're actually passing a real sound file through to playsound_local, though. * - * File format is as follows: [voice name]/[letter]_[variation].wav. + * File format is as follows: [voice name]/[letter][variation].wav. * Each vowel has twenty variations, while each consonant has six. * An Audacity macro to make the sounds less irritating on the ear was made and used to process each voice. It can be found in the initial PR related to this system. */ @@ -70,7 +70,6 @@ for(var/i in 1 to min(length(all_boops), MAX_DOPPLERBOOP_CHARACTERS)) var/volume = initial_volume - var/falloff_exponent = initial_falloff var/current_delay = initial_delay if(!all_boops[i] || all_boops[i] == " ") continue @@ -91,7 +90,7 @@ variation = rand(1, 5) final_boop = sound("modular_doppler/dopplerboop/voices/[chosen_boop]/[boop_letter][variation].wav") - addtimer(CALLBACK(src, PROC_REF(play_dopplerboop), hearers, dopplerbooper, final_boop, volume, initial_dopplerboop_time, falloff_exponent, frequency), dopplerboop_delay_cumulative + current_delay) + addtimer(CALLBACK(src, PROC_REF(play_dopplerboop), hearers, dopplerbooper, final_boop, volume, initial_dopplerboop_time, initial_falloff, frequency), dopplerboop_delay_cumulative + current_delay) dopplerboop_delay_cumulative += current_delay /datum/component/dopplerboop/proc/play_dopplerboop(list/hearers, mob/dopplerbooper, final_boop, volume, initial_dopplerboop_time, falloff_exponent, freq) diff --git a/modular_doppler/modular_customization/preferences/middleware/dopplerboops.dm b/modular_doppler/modular_customization/preferences/middleware/dopplerboops.dm index d945592952984..fb8cd67c3a4db 100644 --- a/modular_doppler/modular_customization/preferences/middleware/dopplerboops.dm +++ b/modular_doppler/modular_customization/preferences/middleware/dopplerboops.dm @@ -1,6 +1,6 @@ -/// Middleware gamejacked fromfrom TTS preview. +/// Middleware gamejacked from TTS preview. /datum/preference_middleware/dopplerboop - /// Cooldown on requesting a TTS preview. + /// Cooldown on requesting a dopplerboop preview. COOLDOWN_DECLARE(dopplerboop_cooldown) action_delegations = list( diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/doppler/voice.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/doppler/voice.tsx index deedf350da6c8..c43b92dc8c9cf 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/doppler/voice.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/doppler/voice.tsx @@ -1,14 +1,8 @@ import { Button, Stack } from '../../../../../../components'; -import { - FeatureChoiced, - FeatureChoicedServerData, - FeatureValueProps, -} from '../../base'; +import { FeatureChoiced, FeatureValueProps } from '../../base'; import { FeatureDropdownInput } from '../../dropdowns'; -const FeatureBoopDropdownInput = ( - props: FeatureValueProps, -) => { +const FeatureBoopDropdownInput = (props: FeatureValueProps) => { return (