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-10 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16087 from SandPoot/jukebox-safety

Browse Source 
Adds safeties for jukeboxes on issues that could happen
This commit is contained in:
deathride58
2024-05-17 20:43:43 -04:00
committed by GitHub
parent 7901edea8f 0a074ecb63
commit 22a0ad4b7c
1 changed files with 67 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
code/controllers/subsystem/jukeboxes.dm
View File

@@ -13,6 +13,16 @@
#define JUKE_FALLOFF 4
#define JUKE_SOUND 5
// Track data
/// Name of the track
#define TRACK_NAME 1
/// Length of the track (in deciseconds)
#define TRACK_LENGTH 2
/// BPM of the track (in deciseconds)
#define TRACK_BEAT 3
/// Unique code-facing identifier for this track
#define TRACK_ID 4
SUBSYSTEM_DEF(jukeboxes)
name = "Jukeboxes"
@@ -66,7 +76,7 @@ SUBSYSTEM_DEF(jukeboxes)
//Updates jukebox by transferring to different object or modifying falloff.
/datum/controller/subsystem/jukeboxes/proc/updatejukebox(IDtoupdate, obj/jukebox, jukefalloff)
/datum/controller/subsystem/jukeboxes/proc/updatejukebox(IDtoupdate, obj/jukebox, jukefalloff)
if(islist(activejukeboxes[IDtoupdate]))
if(istype(jukebox))
activejukeboxes[IDtoupdate][JUKE_BOX] = jukebox
@@ -94,19 +104,60 @@ SUBSYSTEM_DEF(jukeboxes)
return FALSE
/datum/controller/subsystem/jukeboxes/Initialize()
init_channels()
var/list/tracks = flist("config/jukebox_music/sounds/")
for(var/S in tracks)
var/datum/track/T = new()
T.song_path = file("config/jukebox_music/sounds/[S]")
var/list/L = splittext(S,"+")
T.song_name = L[1]
T.song_length = text2num(L[2])
T.song_beat = text2num(L[3])
T.song_associated_id = L[4]
songs |= T
for(var/track in tracks)
var/datum/track/track_datum = add_track(track)
if(!track_datum)
continue
songs |= track_datum
return ..()
/// Creates audio channels for jukeboxes to use, run first to prevent init failing to fill this
/datum/controller/subsystem/jukeboxes/proc/init_channels()
for(var/i in CHANNEL_JUKEBOX_START to CHANNEL_JUKEBOX)
freejukeboxchannels |= i
return ..()
/datum/controller/subsystem/jukeboxes/proc/add_track(track)
var/datum/track/track_datum = new()
track_datum.song_path = file("config/jukebox_music/sounds/[track]")
var/list/track_data = splittext(track,"+")
if(!LAZYLEN(track_data))
stack_trace("Invalid track: [track]")
return FALSE
var/track_name = LAZYACCESS(track_data, TRACK_NAME)
if(!track_name)
stack_trace("Track [track] lacks name???")
return FALSE
track_datum.song_name = track_name
var/track_length = LAZYACCESS(track_data, TRACK_LENGTH)
if(!track_length)
stack_trace("Track [track] lacks length.")
return FALSE
track_length = text2num(track_length)
if(!isnum(track_length))
stack_trace("Track [track]'s length value is not a number")
return FALSE
track_datum.song_length = track_length
var/track_beat = LAZYACCESS(track_data, TRACK_BEAT)
if(!track_beat)
stack_trace("Track [track] lacks BPM.")
return FALSE
track_beat = text2num(track_beat)
if(!isnum(track_beat))
stack_trace("Track [track]'s beat value is not a number")
return FALSE
track_datum.song_beat = track_beat
var/track_id = LAZYACCESS(track_data, TRACK_ID)
if(!track_id)
stack_trace("Track [track] lacks an unique identifier.")
return FALSE
track_datum.song_associated_id = track_id
return track_datum
/datum/controller/subsystem/jukeboxes/fire()
if(!activejukeboxes.len)
@@ -181,6 +232,11 @@ SUBSYSTEM_DEF(jukeboxes)
CHECK_TICK
return
#undef TRACK_NAME
#undef TRACK_LENGTH
#undef TRACK_BEAT
#undef TRACK_ID
#undef JUKE_TRACK
#undef JUKE_CHANNEL
#undef JUKE_BOX