cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 18:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes baystruments (#11790)

Browse Source 
* fix

* sigh
This commit is contained in:
kevinz000
2020-04-10 06:36:42 -07:00
committed by GitHub
parent 753be141be
commit d19dd8f2e1
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/__DEFINES/instruments.dm
View File

@@ -19,7 +19,7 @@
#define INSTRUMENT_EXP_FALLOFF_MAX 10 #define INSTRUMENT_EXP_FALLOFF_MAX 10
/// Minimum volume for when the sound is considered dead. /// Minimum volume for when the sound is considered dead.
#define INSTRUMENT_MIN_SUSTAIN_DROPOFF 30 #define INSTRUMENT_MIN_SUSTAIN_DROPOFF 0
#define SUSTAIN_LINEAR 1 #define SUSTAIN_LINEAR 1
#define SUSTAIN_EXPONENTIAL 2 #define SUSTAIN_EXPONENTIAL 2

2
code/modules/client/asset_cache.dm
View File

@@ -529,7 +529,7 @@ GLOBAL_LIST_EMPTY(asset_datums)
"pill21" = 'icons/UI_Icons/Pills/pill21.png', "pill21" = 'icons/UI_Icons/Pills/pill21.png',
"pill22" = 'icons/UI_Icons/Pills/pill22.png', "pill22" = 'icons/UI_Icons/Pills/pill22.png',
) )
/datum/asset/simple/IRV /datum/asset/simple/IRV
assets = list( assets = list(
"jquery-ui.custom-core-widgit-mouse-sortable-min.js" = 'html/IRV/jquery-ui.custom-core-widgit-mouse-sortable-min.js', "jquery-ui.custom-core-widgit-mouse-sortable-min.js" = 'html/IRV/jquery-ui.custom-core-widgit-mouse-sortable-min.js',

4
code/modules/instruments/songs/_song.dm
View File

@@ -60,7 +60,7 @@
* Compilation happens when we start playing and is cleared after we finish playing. * Compilation happens when we start playing and is cleared after we finish playing.
*/ */
var/list/compiled_chords var/list/compiled_chords
/// Channel as text = current volume /// Channel as text = current volume percentage but it's 0 to 100 instead of 0 to 1.
var/list/channels_playing = list() var/list/channels_playing = list()
/// List of channels that aren't being used, as text. This is to prevent unnecessary freeing and reallocations from SSsounds/SSinstruments. /// List of channels that aren't being used, as text. This is to prevent unnecessary freeing and reallocations from SSsounds/SSinstruments.
var/list/channels_idle = list() var/list/channels_idle = list()
@@ -237,7 +237,7 @@
cached_exponential_dropoff = sustain_exponential_dropoff cached_exponential_dropoff = sustain_exponential_dropoff
// Linear, not so much, since it's a target duration from 100 volume rather than an exponential rate. // Linear, not so much, since it's a target duration from 100 volume rather than an exponential rate.
var/target_duration = sustain_linear_duration var/target_duration = sustain_linear_duration
var/volume_diff = max(0, volume - sustain_dropoff_volume) var/volume_diff = max(0, 100 - sustain_dropoff_volume)
var/volume_decrease_per_decisecond = volume_diff / target_duration var/volume_decrease_per_decisecond = volume_diff / target_duration
cached_linear_dropoff = volume_decrease_per_decisecond cached_linear_dropoff = volume_decrease_per_decisecond

4
code/modules/instruments/songs/play_synthesized.dm
View File

@@ -76,7 +76,7 @@
copy.frequency = K.frequency copy.frequency = K.frequency
copy.volume = volume copy.volume = volume
var/channel_text = num2text(channel) var/channel_text = num2text(channel)
channels_playing[channel_text] = volume channels_playing[channel_text] = 100
last_channel_played = channel_text last_channel_played = channel_text
for(var/i in hearing_mobs) for(var/i in hearing_mobs)
var/mob/M = i var/mob/M = i
@@ -132,4 +132,4 @@
else else
for(var/i in hearing_mobs) for(var/i in hearing_mobs)
var/mob/M = i var/mob/M = i
M.set_sound_channel_volume(channelnumber, current_volume) M.set_sound_channel_volume(channelnumber, (current_volume * 0.01) * volume * using_instrument.volume_multiplier)