Modular Computer Revival (#5542)

Co-authored-by: silicons <no@you.cat>

code/modules/modular_computers/computers/modular_computer/core.dm

@@ -1,14 +1,13 @@
-/obj/item/modular_computer/process(delta_time)
+/obj/item/modular_computer/process()
 	if(!enabled) // The computer is turned off
 		last_power_usage = 0
-		return FALSE
+		return 0
 
 	if(damage > broken_damage)
 		shutdown_computer()
-		return FALSE
+		return 0
 
-	// Active program requires NTNet to run but we've just lost connection. Crash.
-	if(active_program && active_program.requires_ntnet && !get_ntnet_status(active_program.requires_ntnet_feature))
+	if(active_program && active_program.requires_ntnet && !get_ntnet_status(active_program.requires_ntnet_feature)) // Active program requires NTNet to run but we've just lost connection. Crash.
 		active_program.event_networkfailure(0)
 
 	for(var/datum/computer_file/program/P in idle_threads)
@@ -34,22 +33,22 @@
 	handle_power() // Handles all computer power interaction
 	check_update_ui_need()
 
-/// Used to perform preset-specific hardware changes.
+// Used to perform preset-specific hardware changes.
 /obj/item/modular_computer/proc/install_default_hardware()
-	return TRUE
+	return 1
 
-/// Used to install preset-specific programs
+// Used to install preset-specific programs
 /obj/item/modular_computer/proc/install_default_programs()
-	return TRUE
+	return 1
 
-/obj/item/modular_computer/Initialize(mapload)
-	. = ..()
+/obj/item/modular_computer/Initialize()
 	START_PROCESSING(SSobj, src)
 	install_default_hardware()
 	if(hard_drive)
 		install_default_programs()
 	update_icon()
 	update_verbs()
+	. = ..()
 
 /obj/item/modular_computer/Destroy()
 	kill_program(1)
@@ -64,9 +63,9 @@
 		to_chat(user, "\The [src] was already emagged.")
 		return //NO_EMAG_ACT
 	else
-		computer_emagged = TRUE
+		computer_emagged = 1
 		to_chat(user, "You emag \the [src]. It's screen briefly shows a \"OVERRIDE ACCEPTED: New software downloads available.\" message.")
-		return TRUE
+		return 1
 
 /obj/item/modular_computer/update_icon()
 	icon_state = icon_state_unpowered
@@ -91,11 +90,11 @@
 
 	add_overlay(overlays_to_add)
 
-/obj/item/modular_computer/proc/turn_on(mob/user)
+/obj/item/modular_computer/proc/turn_on(var/mob/user)
 	if(bsod)
 		return
 	if(tesla_link)
-		tesla_link.enabled = TRUE
+		tesla_link.enabled = 1
 	var/issynth = issilicon(user) // Robots and AIs get different activation messages.
 	if(damage > broken_damage)
 		if(issynth)
@@ -116,39 +115,39 @@
 		else
 			to_chat(user, "You press the power button but \the [src] does not respond")
 
-/// Relays kill program request to currently active program. Use this to quit current program.
-/obj/item/modular_computer/proc/kill_program(forced = FALSE)
+// Relays kill program request to currently active program. Use this to quit current program.
+/obj/item/modular_computer/proc/kill_program(var/forced = 0)
 	if(active_program)
 		active_program.kill_program(forced)
 		active_program = null
 	var/mob/user = usr
 	if(user && istype(user))
-		nano_ui_interact(user) // Re-open the UI on this computer. It should show the main screen now.
+		ui_interact(user) // Re-open the UI on this computer. It should show the main screen now.
 	update_icon()
 
 // Returns 0 for No Signal, 1 for Low Signal and 2 for Good Signal. 3 is for wired connection (always-on)
-/obj/item/modular_computer/proc/get_ntnet_status(specific_action = 0)
+/obj/item/modular_computer/proc/get_ntnet_status(var/specific_action = 0)
 	if(network_card)
 		return network_card.get_signal(specific_action)
 	else
-		return FALSE
+		return 0
 
-/obj/item/modular_computer/proc/add_log(text)
+/obj/item/modular_computer/proc/add_log(var/text)
 	if(!get_ntnet_status())
-		return FALSE
+		return 0
 	return ntnet_global.add_log(text, network_card)
 
-/obj/item/modular_computer/proc/shutdown_computer(loud = TRUE)
+/obj/item/modular_computer/proc/shutdown_computer(var/loud = 1)
 	kill_program(1)
 	for(var/datum/computer_file/program/P in idle_threads)
 		P.kill_program(1)
 		idle_threads.Remove(P)
 	if(loud)
 		visible_message("\The [src] shuts down.")
-	enabled = FALSE
+	enabled = 0
 	update_icon()
 
-/obj/item/modular_computer/proc/enable_computer(mob/user = null)
+/obj/item/modular_computer/proc/enable_computer(var/mob/user = null)
 	enabled = 1
 	update_icon()
 
@@ -158,7 +157,7 @@
 		run_program(autorun.stored_data)
 
 	if(user)
-		nano_ui_interact(user)
+		ui_interact(user)
 
 /obj/item/modular_computer/proc/minimize_program(mob/user)
 	if(!active_program || !processor_unit)
@@ -166,12 +165,12 @@
 
 	idle_threads.Add(active_program)
 	active_program.program_state = PROGRAM_STATE_BACKGROUND // Should close any existing UIs
-	SSnanoui.close_uis(active_program.NM ? active_program.NM : active_program)
 	SStgui.close_uis(active_program.TM ? active_program.TM : active_program)
 	active_program = null
 	update_icon()
 	if(istype(user))
-		nano_ui_interact(user) // Re-open the UI on this computer. It should show the main screen now.
+		ui_interact(user) // Re-open the UI on this computer. It should show the main screen now.
+
 
 /obj/item/modular_computer/proc/run_program(prog)
 	var/datum/computer_file/program/P = null
@@ -180,7 +179,7 @@
 		P = hard_drive.find_file_by_name(prog)
 
 	if(!P || !istype(P)) // Program not found or it's not executable program.
-		to_chat(user, SPAN_DANGER("\The [src]'s screen shows \"I/O ERROR - Unable to run [prog]\" warning."))
+		to_chat(user, "<span class='danger'>\The [src]'s screen shows \"I/O ERROR - Unable to run [prog]\" warning.</span>")
 		return
 
 	P.computer = src
@@ -195,11 +194,11 @@
 		return
 
 	if(idle_threads.len >= processor_unit.max_idle_programs+1)
-		to_chat(user, SPAN_NOTICE("\The [src] displays a \"Maximal CPU load reached. Unable to run another program.\" error"))
+		to_chat(user, "<span class='notice'>\The [src] displays a \"Maximal CPU load reached. Unable to run another program.\" error</span>")
 		return
 
 	if(P.requires_ntnet && !get_ntnet_status(P.requires_ntnet_feature)) // The program requires NTNet connection, but we are not connected to NTNet.
-		to_chat(user, SPAN_DANGER("\The [src]'s screen shows \"NETWORK ERROR - Unable to connect to NTNet. Please retry. If problem persists contact your system administrator.\" warning."))
+		to_chat(user, "<span class='danger'>\The [src]'s screen shows \"NETWORK ERROR - Unable to connect to NTNet. Please retry. If problem persists contact your system administrator.\" warning.</span>")
 		return
 
 	if(active_program)
@@ -207,15 +206,15 @@
 
 	if(P.run_program(user))
 		update_icon()
-	return TRUE
+	return 1
 
 /obj/item/modular_computer/proc/update_uis()
-	if(active_program) //Should we update program ui or computer ui?
-		SSnanoui.update_uis(active_program)
-		if(active_program.NM)
-			SSnanoui.update_uis(active_program.NM)
+	if(active_program)
+		SStgui.update_uis(active_program)
+		if(active_program.TM)
+			SStgui.update_uis(active_program.TM)
 	else
-		SSnanoui.update_uis(src)
+		SStgui.update_uis(src)
 
 /obj/item/modular_computer/proc/check_update_ui_need()
 	var/ui_update_needed = FALSE
@@ -252,12 +251,16 @@
 		update_uis()
 
 // Used by camera monitor program
-/obj/item/modular_computer/check_eye(mob/user)
+/obj/item/modular_computer/check_eye(var/mob/user)
 	if(active_program)
 		return active_program.check_eye(user)
 	else
 		return ..()
 
+/obj/item/modular_computer/relaymove(var/mob/user, direction)
+	if(active_program)
+		return active_program.relaymove(user, direction)
+
 /obj/item/modular_computer/proc/set_autorun(program)
 	if(!hard_drive)
 		return

code/modules/modular_computers/computers/modular_computer/interaction.dm

@@ -120,7 +120,7 @@
 	if(.)
 		return
 	if(enabled && screen_on)
-		nano_ui_interact(user)
+		ui_interact(user)
 	else if(!enabled && screen_on)
 		turn_on(user)
 

code/modules/modular_computers/computers/modular_computer/ui.dm

@@ -1,5 +1,10 @@
-// Operates NanoUI
-/obj/item/modular_computer/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1)
+// Operates TGUI
+/obj/item/modular_computer/ui_assets(mob/user)
+	return list(
+		get_asset_datum(/datum/asset/simple/headers)
+	)
+
+/obj/item/modular_computer/ui_interact(mob/user, datum/tgui/ui)
 	if(!screen_on || !enabled)
 		if(ui)
 			ui.close()
@@ -13,7 +18,7 @@
 	if(active_program)
 		if(ui) // This is the main laptop screen. Since we are switching to program's UI close it for now.
 			ui.close()
-		active_program.nano_ui_interact(user)
+		active_program.ui_interact(user)
 		return
 
 	// We are still here, that means there is no program loaded. Load the BIOS/ROM/OS/whatever you want to call it.
@@ -22,80 +27,99 @@
 		visible_message("\The [src] beeps three times, it's screen displaying \"DISK ERROR\" warning.")
 		return // No HDD, No HDD files list or no stored files. Something is very broken.
 
-	var/datum/computer_file/data/autorun = hard_drive.find_file_by_name("autorun")
+	ui = SStgui.try_update_ui(user, src, ui)
+	if(!ui)
+		ui = new(user, src, "NtosMain")
+		ui.set_autoupdate(TRUE)
+		ui.open()
 
+/obj/item/modular_computer/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state)
 	var/list/data = get_header_data()
 
-	var/list/programs = list()
-	for(var/datum/computer_file/program/P in hard_drive.stored_files)
-		var/list/program = list()
-		program["name"] = P.filename
-		program["desc"] = P.filedesc
-		program["icon"] = P.program_menu_icon
-		program["autorun"] = (istype(autorun) && (autorun.stored_data == P.filename)) ? 1 : 0
-		if(P in idle_threads)
-			program["running"] = 1
-		programs.Add(list(program))
+	data["login"] = list()
+	var/obj/item/computer_hardware/card_slot/cardholder = card_slot
+	if(cardholder)
+		var/obj/item/card/id/stored_card = cardholder.stored_card
+		if(stored_card)
+			var/stored_name = stored_card.registered_name
+			var/stored_title = stored_card.assignment
+			if(!stored_name)
+				stored_name = "Unknown"
+			if(!stored_title)
+				stored_title = "Unknown"
+			data["login"] = list(
+				IDName = stored_name,
+				IDJob = stored_title,
+			)
 
-	data["programs"] = programs
-	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if (!ui)
-		ui = new(user, src, ui_key, "laptop_mainscreen.tmpl", "NTOS Main Menu", 400, 500)
-		ui.auto_update_layout = 1
-		ui.set_initial_data(data)
-		ui.open()
-		ui.set_auto_update(1)
+	data["removable_media"] = list()
+
+	var/datum/computer_file/data/autorun = hard_drive.find_file_by_name("autorun")
+	data["programs"] = list()
+	for(var/datum/computer_file/program/P in hard_drive.stored_files)
+		var/running = FALSE
+		if(P in idle_threads)
+			running = TRUE
+
+		data["programs"] += list(list(
+			"name" = P.filename,
+			"desc" = P.filedesc,
+			"icon" = P.program_menu_icon,
+			"running" = running,
+			"autorun" = (istype(autorun) && (autorun.stored_data == P.filename)) ? 1 : 0
+		))
+
+	data["has_light"] = FALSE // has_light
+	data["light_on"] = FALSE // light_on
+	data["comp_light_color"] = null // comp_light_color
+
+	return data
 
 // Handles user's GUI input
-/obj/item/modular_computer/Topic(href, href_list)
+/obj/item/modular_computer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
 	if(..())
-		return 1
-	if( href_list["PC_exit"] )
-		kill_program()
-		return 1
-	if( href_list["PC_enable_component"] )
-		var/obj/item/computer_hardware/H = find_hardware_by_name(href_list["PC_enable_component"])
-		if(H && istype(H) && !H.enabled)
-			H.enabled = 1
-		. = 1
-	if( href_list["PC_disable_component"] )
-		var/obj/item/computer_hardware/H = find_hardware_by_name(href_list["PC_disable_component"])
-		if(H && istype(H) && H.enabled)
-			H.enabled = 0
-		. = 1
-	if( href_list["PC_shutdown"] )
-		shutdown_computer()
-		return 1
-	if( href_list["PC_minimize"] )
-		var/mob/user = usr
-		minimize_program(user)
+		return TRUE
 
-	if( href_list["PC_killprogram"] )
-		var/prog = href_list["PC_killprogram"]
-		var/datum/computer_file/program/P = null
-		var/mob/user = usr
-		if(hard_drive)
-			P = hard_drive.find_file_by_name(prog)
+	switch(action)
+		if("PC_exit")
+			kill_program()
+			return TRUE
+		if("PC_shutdown")
+			shutdown_computer()
+			return TRUE
+		if("PC_minimize")
+			var/mob/user = usr
+			minimize_program(user)
+		if("PC_killprogram")
+			var/prog = params["name"]
+			var/datum/computer_file/program/P = null
+			var/mob/user = usr
+			if(hard_drive)
+				P = hard_drive.find_file_by_name(prog)
 
-		if(!istype(P) || P.program_state == PROGRAM_STATE_KILLED)
+			if(!istype(P) || P.program_state == PROGRAM_STATE_KILLED)
+				return
+
+			P.kill_program(1)
+			to_chat(user, "<span class='notice'>Program [P.filename].[P.filetype] with PID [rand(100,999)] has been killed.</span>")
+			return TRUE
+		if("PC_runprogram")
+			return run_program(params["name"])
+		if("PC_setautorun")
+			if(!hard_drive)
+				return
+			set_autorun(params["name"])
+			return TRUE
+		if("PC_Eject_Disk")
+			var/param = params["name"]
+			switch(param)
+				if("ID")
+					proc_eject_id(usr)
+					return TRUE
+		else
 			return
 
-		P.kill_program(1)
-		update_uis()
-		to_chat(user, "<span class='notice'>Program [P.filename].[P.filetype] with PID [rand(100,999)] has been killed.</span>")
-
-	if( href_list["PC_runprogram"] )
-		return run_program(href_list["PC_runprogram"])
-
-	if( href_list["PC_setautorun"] )
-		if(!hard_drive)
-			return
-		set_autorun(href_list["PC_setautorun"])
-
-	if(.)
-		update_uis()
-
-// Function used by NanoUI's to obtain data for header. All relevant entries begin with "PC_"
+// Function used by TGUI's to obtain data for header. All relevant entries begin with "PC_"
 /obj/item/modular_computer/proc/get_header_data()
 	var/list/data = list()