From ceb107860fae8f6746e4f39058ffa0acaa9d9da7 Mon Sep 17 00:00:00 2001 From: Contrabang <91113370+Contrabang@users.noreply.github.com> Date: Sun, 7 Aug 2022 16:11:33 -0700 Subject: [PATCH] Cleans up the universal recorder, shifts it away from verbs (#18519) * recorder pt 1 * part 2 * consistency * nuke that verb * ruined comment * fixes update_icon pt1 * update_icon_state() * fix, address sirryan and moxian * oops that should be 600 to function properly * aaaa spacing * Sirryan Review * HAL review * Hal review --- .../objects/items/devices/taperecorder.dm | 252 ++++++++++-------- .../objects/items/weapons/storage/boxes.dm | 2 +- 2 files changed, 136 insertions(+), 118 deletions(-) diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index f39dcceeaaf..045b0b30765 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -11,16 +11,35 @@ throwforce = 0 drop_sound = 'sound/items/handling/taperecorder_drop.ogg' pickup_sound = 'sound/items/handling/taperecorder_pickup.ogg' - var/recording = 0 - var/playing = 0 + /// If its currently recording + var/recording + /// If its playing back auto via atom_say + var/playing + /// The amount of time between something said during playback var/playsleepseconds = 0 + /// The tape we are recording to var/obj/item/tape/mytape - var/open_panel = 0 - var/canprint = 1 + /// The next worldtime we'll be able to print + var/cooldown = 0 var/starts_with_tape = TRUE - ///Sound loop that plays when recording or playing back. + /// Sound loop that plays when recording or playing back. var/datum/looping_sound/tape_recorder_hiss/soundloop +/obj/item/taperecorder/examine(mob/user) + . = ..() + if(in_range(user, src) && mytape) + if(mytape.ruined) + . += "[mytape]'s internals are unwound.'." + if(mytape.max_capacity <= mytape.used_capacity) + . += "[mytape] is full." + else if((mytape.remaining_capacity % 60) == 0) // if there is no seconds (modulo = 0), then only show minutes + . += "[mytape] has [mytape.remaining_capacity / 60] minutes remaining." + else + if(mytape.used_capacity >= mytape.max_capacity - 60) + . += "[mytape] has [mytape.remaining_capacity] seconds remaining." // to avoid having 0 minutes + else + . += "[mytape] has [seconds_to_time(mytape.remaining_capacity)] remaining." + . += "Alt-Click to access the tape." /obj/item/taperecorder/New() ..() @@ -34,12 +53,6 @@ QDEL_NULL(soundloop) return ..() -/obj/item/taperecorder/examine(mob/user) - . = ..() - if(in_range(user, src)) - . += "The wire panel is [open_panel ? "opened" : "closed"]." - - /obj/item/taperecorder/proc/update_sound() if(!playing && !recording) soundloop.stop() @@ -55,16 +68,6 @@ playsound(src, 'sound/items/taperecorder/taperecorder_close.ogg', 50, FALSE) update_icon(UPDATE_ICON_STATE) -/obj/item/taperecorder/proc/eject(mob/user) - if(mytape) - playsound(src, 'sound/items/taperecorder/taperecorder_open.ogg', 50, FALSE) - to_chat(user, "You remove [mytape] from [src].") - stop() - user.put_in_hands(mytape) - mytape = null - update_icon(UPDATE_ICON_STATE) - - /obj/item/taperecorder/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE) mytape?.ruin() //Fires destroy the tape return ..() @@ -79,30 +82,7 @@ return ..() - -/obj/item/taperecorder/verb/ejectverb() - set name = "Eject Tape" - set category = "Object" - - if(usr.incapacitated()) - return - if(!mytape) - return - - eject(usr) - - -/obj/item/taperecorder/update_icon_state() - if(!mytape) - icon_state = "taperecorder_empty" - else if(recording) - icon_state = "taperecorder_recording" - else if(playing) - icon_state = "taperecorder_playing" - else - icon_state = "taperecorder_idle" - -/obj/item/taperecorder/hear_talk(mob/living/M as mob, list/message_pieces) +/obj/item/taperecorder/hear_talk(mob/living/M, list/message_pieces) // Currently can't tell if you're whispering, but can hear it if nearby var/msg = multilingual_to_message(message_pieces) if(mytape && recording) var/ending = copytext(msg, length(msg)) @@ -126,12 +106,32 @@ mytape.timestamp += mytape.used_capacity mytape.storedinfo += "\[[time2text(mytape.used_capacity * 10,"mm:ss")]\] [M.name] [msg]" -/obj/item/taperecorder/verb/record() - set name = "Start Recording" - set category = "Object" - - if(usr.incapacitated()) +/obj/item/taperecorder/attack_self(mob/user) + if(!mytape || mytape.ruined) return + if(recording) + stop() + else + record() + +/obj/item/taperecorder/AltClick(mob/user) + if(in_range(user, src) && mytape && !HAS_TRAIT(user, TRAIT_HANDS_BLOCKED)) + var/list/options = list( "Playback Tape" = image(icon = 'icons/obj/device.dmi', icon_state = "taperecorder_playing"), + "Print Transcript" = image(icon = 'icons/obj/bureaucracy.dmi', icon_state = "paper_words"), + "Eject Tape" = image(icon = 'icons/obj/device.dmi', icon_state = "[mytape.icon_state]") + ) + var/choice = show_radial_menu(user, src, options) + if(user.incapacitated()) + return + switch(choice) + if("Playback Tape") + play(user) + if("Print Transcript") + print_transcript(user) + if("Eject Tape") + eject(user) + +/obj/item/taperecorder/proc/record(mob/user) if(!mytape || mytape.ruined) return if(recording) @@ -155,20 +155,15 @@ break mytape.used_capacity++ used++ + mytape.remaining_capacity = mytape.max_capacity - mytape.used_capacity sleep(10) stop() else - atom_say("The tape is full!") + atom_say("[mytape] is full!") playsound(src, 'sound/items/taperecorder/taperecorder_stop.ogg', 50, FALSE) -/obj/item/taperecorder/verb/stop() - set name = "Stop" - set category = "Object" - - if(usr.incapacitated()) - return - +/obj/item/taperecorder/proc/stop(PlaybackOverride = FALSE) if(recording) mytape.timestamp += mytape.used_capacity mytape.storedinfo += "\[[time2text(mytape.used_capacity * 10,"mm:ss")]\] Recording stopped." @@ -177,23 +172,25 @@ recording = FALSE else if(playing) playsound(src, 'sound/items/taperecorder/taperecorder_stop.ogg', 50, FALSE) - atom_say("Playback stopped.") + if(!PlaybackOverride) + atom_say("Playback stopped.") playing = FALSE update_icon(UPDATE_ICON_STATE) update_sound() -/obj/item/taperecorder/verb/play() - set name = "Play Tape" - set category = "Object" - - if(usr.incapacitated()) - return +/obj/item/taperecorder/proc/play(mob/user) if(!mytape || mytape.ruined) return if(recording) return if(playing) + stop() + return + if(!length(mytape.storedinfo)) + atom_say("There is no stored data.") + playsound(src, 'sound/items/taperecorder/taperecorder_play.ogg', 50, FALSE) + playsound(src, 'sound/items/taperecorder/taperecorder_stop.ogg', 50, FALSE) return playing = TRUE @@ -203,49 +200,33 @@ playsound(src, 'sound/items/taperecorder/taperecorder_play.ogg', 50, FALSE) var/used = mytape.used_capacity //to stop runtimes when you eject the tape var/max = mytape.max_capacity - for(var/i = 1, used < max, sleep(10 * playsleepseconds)) + for(var/i = 1, used <= max) // <= to let it play if the tape is full + sleep(playsleepseconds) if(!mytape) break if(playing == 0) break - if(mytape.storedinfo.len < i) + if(length(mytape.storedinfo) < i) atom_say("End of recording.") break atom_say("[mytape.storedinfo[i]]") - if(mytape.storedinfo.len < i + 1) - playsleepseconds = 1 - sleep(10) - atom_say("End of recording.") + if(length(mytape.storedinfo) < i + 1) + playsleepseconds = 1 SECONDS else - playsleepseconds = mytape.timestamp[i + 1] - mytape.timestamp[i] - if(playsleepseconds > 14) + playsleepseconds = (mytape.timestamp[i + 1] - mytape.timestamp[i]) SECONDS + if(playsleepseconds > 1.4 SECONDS) sleep(10) - atom_say("Skipping [playsleepseconds] seconds of silence.") - playsleepseconds = 1 + atom_say("Skipping [playsleepseconds / 10] seconds of silence.") + playsleepseconds = 1 SECONDS i++ - stop() + stop(TRUE) - -/obj/item/taperecorder/attack_self(mob/user) - if(!mytape || mytape.ruined) - return - if(recording) - stop() - else - record() - - -/obj/item/taperecorder/verb/print_transcript() - set name = "Print Transcript" - set category = "Object" - - if(usr.incapacitated()) - return +/obj/item/taperecorder/proc/print_transcript(mob/user) if(!mytape) return - if(!canprint) - to_chat(usr, "The recorder can't print that fast!") + if(world.time < cooldown) + to_chat(user, "The recorder can't print that fast!") return if(recording || playing) return @@ -258,16 +239,34 @@ t1 += "[mytape.storedinfo[i]]
" P.info = t1 P.name = "paper- 'Transcript'" - usr.put_in_hands(P) - canprint = 0 - sleep(300) - canprint = 1 + user.put_in_hands(P) + cooldown = world.time + 3 SECONDS + +/obj/item/taperecorder/proc/eject(mob/user) + if(HAS_TRAIT(user, TRAIT_HANDS_BLOCKED)) + return + if(mytape) + playsound(src, 'sound/items/taperecorder/taperecorder_open.ogg', 50, FALSE) + to_chat(user, "You remove [mytape] from [src].") + stop() + user.put_in_hands(mytape) + mytape = null + update_icon(UPDATE_ICON_STATE) + +/obj/item/taperecorder/update_icon_state() + if(!mytape) + icon_state = "taperecorder_empty" + else if(recording) + icon_state = "taperecorder_recording" + else if(playing) + icon_state = "taperecorder_playing" + else + icon_state = "taperecorder_idle" //empty tape recorders /obj/item/taperecorder/empty starts_with_tape = FALSE - /obj/item/tape name = "tape" desc = "A magnetic tape that can hold up to ten minutes of content." @@ -282,18 +281,33 @@ pickup_sound = 'sound/items/handling/tape_pickup.ogg' var/max_capacity = 600 var/used_capacity = 0 + var/remaining_capacity = 600 var/list/storedinfo = list() var/list/timestamp = list() var/ruined = FALSE +/obj/item/tape/examine(mob/user) + . = ..() + if(in_range(user, src)) + if(ruined) + . += "It's tape is all pulled out, it looks it could be screwed back into place." + else if(max_capacity <= used_capacity) + . += "It is full." + else if((remaining_capacity % 60) == 0) // if there is no seconds (modulo = 0), then only show minutes + . += "It has [remaining_capacity / 60] minutes remaining." + else + if(used_capacity >= (max_capacity - 60)) + . += "It has [remaining_capacity] seconds remaining." // to avoid having 0 minutes + else + . += "It has [seconds_to_time(remaining_capacity)] remaining." + /obj/item/tape/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE) ..() ruin() /obj/item/tape/attack_self(mob/user) if(!ruined) - to_chat(user, "You pull out all the tape!") - ruin() + ruin(user) /obj/item/tape/verb/wipe() set name = "Wipe Tape" @@ -305,34 +319,38 @@ return to_chat(usr, "You erase the data from [src].") - clear() + used_capacity = 0 + storedinfo.Cut() + timestamp.Cut() /obj/item/tape/update_overlays() . = ..() if(ruined) . += "ribbonoverlay" -/obj/item/tape/proc/clear() - used_capacity = 0 - storedinfo.Cut() - timestamp.Cut() - -/obj/item/tape/proc/ruin() +/obj/item/tape/proc/ruin(mob/user) + if(user) + to_chat(user, "You start pulling the tape out.") + if(!do_after(user, 1 SECONDS, target = src)) + return + to_chat(user, "You pull the tape out of [src].") ruined = TRUE update_icon(UPDATE_OVERLAYS) -/obj/item/tape/proc/fix() - ruined = FALSE - update_icon(UPDATE_OVERLAYS) - /obj/item/tape/attackby(obj/item/I, mob/user) - if(ruined && istype(I, /obj/item/screwdriver)) + if(istype(I, /obj/item/pen)) + rename_interactive(user, I) + +/obj/item/tape/screwdriver_act(mob/living/user, obj/item/I) + . = ..() + if(ruined) + if(!I.use_tool(src, user, 0, volume = I.tool_volume)) + return to_chat(user, "You start winding the tape back in.") if(do_after(user, 120 * I.toolspeed, target = src)) - to_chat(user, "You wound the tape back in!") - fix() - else if(istype(I, /obj/item/pen)) - rename_interactive(user, I) + to_chat(user, "You wind the tape back in!") + ruined = FALSE + update_icon(UPDATE_OVERLAYS) //Random colour tapes /obj/item/tape/random/New() diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 54c511fae82..9efb1862639 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -321,7 +321,7 @@ /obj/item/storage/box/tapes/populate_contents() for(var/I in 1 to 6) - new /obj/item/tape(src) + new /obj/item/tape/random(src) /obj/item/storage/box/rxglasses name = "prescription glasses"