cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Casino jukebox update

Browse Source 
temporary commit to save work
This commit is contained in:
Shadowfire
2021-07-05 19:05:10 +02:00
parent c194014d3f
commit 590e4ff041
3 changed files with 51 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
code/controllers/subsystems/media_tracks.dm
View File

@@ -9,6 +9,9 @@ SUBSYSTEM_DEF(media_tracks)
var/list/jukebox_tracks = list() var/list/jukebox_tracks = list()
/// Lobby music tracks /// Lobby music tracks
var/list/lobby_tracks = list() var/list/lobby_tracks = list()
/// CHOMPstation edit start: Jack - Injecting casino track into new jukebox subsystem
var/list/casino_tracks = list()
/// CHOMPstation edit end
/datum/controller/subsystem/media_tracks/Initialize(timeofday) /datum/controller/subsystem/media_tracks/Initialize(timeofday)
load_tracks() load_tracks()
@@ -53,6 +56,10 @@ SUBSYSTEM_DEF(media_tracks)
T.secret = entry["secret"] ? 1 : 0 T.secret = entry["secret"] ? 1 : 0
T.lobby = entry["lobby"] ? 1 : 0 T.lobby = entry["lobby"] ? 1 : 0
/// CHOMPstation edit start: Jack - Injecting casino track into new jukebox subsystem
T.casino = entry["casino"] ? 1 : 0
/// CHOMPstation edit end
all_tracks += T all_tracks += T
/datum/controller/subsystem/media_tracks/proc/sort_tracks() /datum/controller/subsystem/media_tracks/proc/sort_tracks()
@@ -61,12 +68,19 @@ SUBSYSTEM_DEF(media_tracks)
jukebox_tracks.Cut() jukebox_tracks.Cut()
lobby_tracks.Cut() lobby_tracks.Cut()
/// CHOMPstation edit start: Jack - Injecting casino track into new jukebox subsystem
casino_tracks.Cut()
/// CHOMPstation edit end
for(var/datum/track/T in all_tracks) for(var/datum/track/T in all_tracks)
if(!T.secret) if(!T.secret)
jukebox_tracks += T jukebox_tracks += T
if(T.lobby) if(T.lobby)
lobby_tracks += T lobby_tracks += T
/// CHOMPstation edit start: Jack - Injecting casino track into new jukebox subsystem
if(T.casino)
casino_tracks += T
/// CHOMPstation edit end
/datum/controller/subsystem/media_tracks/proc/manual_track_add() /datum/controller/subsystem/media_tracks/proc/manual_track_add()
var/client/C = usr.client var/client/C = usr.client
@@ -94,6 +108,7 @@ SUBSYSTEM_DEF(media_tracks)
* "genre": artist of the song, REALLY try to match an existing one (text) * "genre": artist of the song, REALLY try to match an existing one (text)
* "secret": only on hacked jukeboxes (true/false) * "secret": only on hacked jukeboxes (true/false)
* "lobby": plays in the lobby (true/false) * "lobby": plays in the lobby (true/false)
* "casino": plays in the casino (true/false) CHOMPstation casino
*/ */
if(islist(json)) if(islist(json))
@@ -105,7 +120,7 @@ SUBSYSTEM_DEF(media_tracks)
if(!songdata["url"] || !songdata["title"] || !songdata["duration"]) if(!songdata["url"] || !songdata["title"] || !songdata["duration"])
to_chat(C, "<span class='warning'>URL, Title, or Duration was missing from a song. Skipping.</span>") to_chat(C, "<span class='warning'>URL, Title, or Duration was missing from a song. Skipping.</span>")
continue continue
var/datum/track/T = new(songdata["url"], songdata["title"], songdata["duration"], songdata["artist"], songdata["genre"], songdata["secret"], songdata["lobby"]) var/datum/track/T = new(songdata["url"], songdata["title"], songdata["duration"], songdata["artist"], songdata["genre"], songdata["secret"], songdata["lobby"], songdata["casino"])
all_tracks += T all_tracks += T
report_progress("New media track added by [C]: [T.title]") report_progress("New media track added by [C]: [T.title]")
@@ -145,10 +160,23 @@ SUBSYSTEM_DEF(media_tracks)
else else
secret = FALSE secret = FALSE
/// CHOMPstation edit start: Jack - Injecting casino track into new jukebox subsystem
var/casino = tgui_alert(C, "Optional: Mark track as casino music?", "Track Casino", list("Yes", "Cancel", "No"))
if(casino == "Cancel")
return
else if(secret == "Yes")
secret = TRUE
else
secret = FALSE
/// CHOMPstation edit end
var/datum/track/T = new(url, title, duration, artist, genre) var/datum/track/T = new(url, title, duration, artist, genre)
T.secret = secret T.secret = secret
T.lobby = lobby T.lobby = lobby
/// CHOMPstation edit start: Jack - Injecting casino track into new jukebox subsystem
T.casino = casino
/// CHOMPstation edit end
all_tracks += T all_tracks += T

22
code/game/machinery/jukebox_ch.dm
View File

@@ -1,23 +1,13 @@
/*
/obj/machinery/media/jukebox/casinojukebox /obj/machinery/media/jukebox/casinojukebox
name = "space casino jukebox" name = "space casino jukebox"
desc = "A jukebox to play the tracks on the golden goose, jazzy~"
icon = 'icons/obj/casino_ch.dmi' icon = 'icons/obj/casino_ch.dmi'
icon_state = "casinojukebox-nopower" icon_state = "casinojukebox-nopower"
state_base = "casinojukebox" state_base = "casinojukebox"
/* Commenting out for now due to conflicts with upstream jukebox changes. use_power = USE_POWER_OFF
// On initialization, copy our tracks from the global list
/obj/machinery/media/jukebox/casinojukebox/Initialize() /obj/machinery/media/jukebox/casinojukebox/getTracksList()
. = ..() return SSmedia_tracks.casino_tracks
if(LAZYLEN(all_jukebox_tracks)) //Global list has tracks
tracks.Cut()
secret_tracks.Cut()
for(var/datum/track/T in all_jukebox_tracks) //Load them
if(!T.casino)
tracks -= T
secret_tracks -= T
if(T.casino)
tracks |= T
else if(!LAZYLEN(tracks)) //We don't even have default tracks
stat |= BROKEN // No tracks configured this round!
*/ */