From 381c8fe183430dd43f4cae1dc53945f9a1e87f93 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Fri, 10 Jun 2022 04:05:02 -0400 Subject: [PATCH] additional cleanup - turns bark variance into a macro for easy consistency --- code/__DEFINES/say.dm | 2 ++ code/game/say.dm | 2 +- code/modules/client/preferences.dm | 2 +- code/modules/mob/living/say.dm | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/say.dm b/code/__DEFINES/say.dm index 2dabf79e8c..9debb3a699 100644 --- a/code/__DEFINES/say.dm +++ b/code/__DEFINES/say.dm @@ -113,6 +113,8 @@ #define BARK_PITCH_RAND(gend) ((gend == MALE ? rand(60, 120) : (gend == FEMALE ? rand(80, 140) : rand(60,140))) / 100) //Macro for determining random pitch based off gender #define BARK_VARIANCE_RAND (rand(BARK_DEFAULT_MINVARY * 100, BARK_DEFAULT_MAXVARY * 100) / 100) //Macro for randomizing bark variance to reduce the amount of copy-pasta necessary for that +#define BARK_DO_VARY(pitch, variance) (rand(((pitch * 100) - (variance*50)), ((pitch*100) + (variance*50))) / 100) + // Is something in the IC chat filter? This is config dependent. #define CHAT_FILTER_CHECK(T) (config.ic_filter_regex && findtext(T, config.ic_filter_regex)) diff --git a/code/game/say.dm b/code/game/say.dm index d0ef26dcb8..205ddc2f0e 100644 --- a/code/game/say.dm +++ b/code/game/say.dm @@ -60,7 +60,7 @@ GLOBAL_LIST_INIT(freqtospan, list( for(var/i in 1 to barks) if(total_delay > BARK_MAX_TIME) break - addtimer(CALLBACK(src, .proc/bark, hearers, range, vocal_volume, rand((vocal_pitch * 100), (vocal_pitch*100) + (vocal_pitch_range*100)) / 100), total_delay) + addtimer(CALLBACK(src, .proc/bark, hearers, range, vocal_volume, BARK_DO_VARY(vocal_pitch, vocal_pitch_range)), total_delay) total_delay += rand(DS2TICKS(vocal_speed / BARK_SPEED_BASELINE), DS2TICKS(vocal_speed / BARK_SPEED_BASELINE) + DS2TICKS(vocal_speed / BARK_SPEED_BASELINE)) TICKS /atom/movable/proc/compose_message(atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode, face_name = FALSE, atom/movable/source) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 33e87ca0e3..8a9f122f43 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -3082,7 +3082,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) barkbox.set_bark(bark_id) var/total_delay for(var/i in 1 to (round((32 / bark_speed)) + 1)) - addtimer(CALLBACK(barkbox, /atom/movable/proc/bark, list(parent.mob), 7, 70, rand((bark_pitch * 100), (bark_pitch*100) + (bark_variance*100)) / 100), total_delay) + addtimer(CALLBACK(barkbox, /atom/movable/proc/bark, list(parent.mob), 7, 70, BARK_DO_VARY(bark_pitch, bark_variance)), total_delay) total_delay += rand(DS2TICKS(bark_speed/4), DS2TICKS(bark_speed/4) + DS2TICKS(bark_speed/4)) TICKS QDEL_IN(barkbox, total_delay) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 52693d1d88..b90909adf7 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -322,7 +322,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( for(var/i in 1 to barks) if(total_delay > BARK_MAX_TIME) break - addtimer(CALLBACK(src, /atom/movable/proc/bark, listening, (message_range * (is_yell ? 4 : 1)), (vocal_volume * (is_yell ? 1.5 : 1)), rand(vocal_pitch * 100, ((vocal_pitch*100) + (vocal_pitch_range*100))) / 100), total_delay) + addtimer(CALLBACK(src, /atom/movable/proc/bark, listening, (message_range * (is_yell ? 4 : 1)), (vocal_volume * (is_yell ? 1.5 : 1)), BARK_DO_VARY(vocal_pitch, vocal_pitch_range)), total_delay) total_delay += rand(DS2TICKS((vocal_speed / BARK_SPEED_BASELINE) * (is_yell ? 0.5 : 1)), DS2TICKS(vocal_speed / BARK_SPEED_BASELINE) + DS2TICKS((vocal_speed / BARK_SPEED_BASELINE) * (is_yell ? 0.5 : 1))) TICKS