Merge pull request #375 from NataKilar/rnd-adjustments

RND adjustments

Author: NataKilar

mods/persistence/_persistence.dme

@@ -228,6 +228,7 @@
 #include "modules\reagents\reagent_containers\food\food.dm"
 #include "modules\science\_defines.dm"
 #include "modules\science\recipe.dm"
+#include "modules\science\research_overrides.dm"
 #include "modules\science\unfinished_assembly.dm"
 #include "modules\science\files\design.dm"
 #include "modules\science\files\writer.dm"

mods/persistence/controllers/subsystems/initialization/fabrication.dm

@@ -12,7 +12,9 @@
 		research_recipes[fab_class] -= get_unlocked_recipes(fab_class, get_default_initial_tech_levels())
 
 		for(var/datum/fabricator_recipe/recipe in research_recipes[fab_class])
-			if(TECH_ESOTERIC in recipe.required_technology) // These techs must be unlocked via random chance during iteration
+			if(recipe.research_excluded)
+				research_recipes[fab_class] -= recipe
+			else if(TECH_ESOTERIC in recipe.required_technology) // These techs must be unlocked via random chance during iteration
 				research_recipes[fab_class] -= recipe
 
 		if(!length(research_recipes[fab_class]))

mods/persistence/modules/science/files/design.dm

@@ -17,6 +17,7 @@
 	var/list/specifications
 
 	var/finalized = FALSE
+	var/progressing = FALSE // Ready to select a progression/finalization theory.
 
 	var/datum/fabricator_recipe/recipe
 
@@ -35,7 +36,11 @@
 		recipe.fabricator_types = template_recipe.fabricator_types.Copy()
 		research_requirements = recipe.get_mod_research_cost()
 
-		filename = "[replacetext(uniqueness_repository.Generate(/datum/uniqueness_generator/phrase), " ", "_")]"
+		// We use this rather than the recipe name or product name, as it does not have the 'weapon prototype (...)' etc. addition
+		var/item_name = atom_info_repository.get_name_for(recipe.path, amount = 1)
+		// The use of 'sanitize_for_group' is incidental, it just works well for this.
+		item_name = sanitize_for_group(item_name)
+		filename = "[item_name]-([replacetext(uniqueness_repository.Generate(/datum/uniqueness_generator/phrase), " ", "_")])"
 		// Initialize us to zero'd research fields.
 		for(var/field in research_requirements)
 			add_field(field)
@@ -77,17 +82,27 @@
 	// Clear the theory options for everything but the selected option.
 	var/application_result = selected.apply_to_design(src, analyzed)
 	if(finalized)
-		return "You successfully finalize your theory!"
+		return "You successfully finalize your design!"
 	switch(application_result)
 		if(THEORY_SUCCESS)
 			if(selected in theory_options)
 				theory_options[selected] = FALSE // Make sure this theory is removed from the options.
+			
+			// We can progress, generate progression theories.
+			if(can_progress())
+				// Remove all theory options.
+				for(var/theory in theory_options)
+					theory_options[theory] = FALSE
+				progressing = TRUE
 			generate_theories(user)
 			return
 		if(THEORY_NEEDS_ITEM)
 			return "The theory cannot be applied with [analyzed ? "the loaded item" : "no item to be analyzed"]."
 		if(THEORY_CANNOT_PROGRESS)
-			return "Requirements for concluding the theory and progressing have not been met. Use all research points, distributed entirely in required fields."
+			// Somehow we've gotten progression options when the design can't progress. Regenerate all theories.
+			generate_theories(user)
+			return "Requirements for concluding the theory and progressing have not been met. Use all research points, and distribute them entirely into required fields."
+
 		if(THEORY_INCOMPATIBLE)
 			return "That theory is incompatible with the design."
 
@@ -103,7 +118,7 @@
 	if(length(theory_options) >= generated_theories)
 		return
 
-	var/list/theory_paths = get_theory_options(tier, can_progress())
+	var/list/theory_paths = get_theory_options(tier, progressing)
 
 	var/theories = length(theory_options)
 
@@ -159,6 +174,7 @@
 	LAZYADD(specifications, specification)
 
 /datum/computer_file/data/design/proc/progress_tier()
+	progressing = FALSE
 	for(var/field in research_requirements)
 		if(research_levels[field] < research_requirements[field])
 			tier += 1

mods/persistence/modules/science/files/writer.dm

@@ -31,24 +31,40 @@
 		/datum/file_storage/disk/removable,
 		/datum/file_storage/network
 	)
-	var/datum/file_storage/current_filesource = /datum/file_storage/disk
+	var/datum/file_storage/current_filesource
 
 	var/selected_fab_type = FABRICATOR_CLASS_PROTOLATHE
 	var/search_string
 	var/current_page = 1
 
+	var/list/cached_recipe_data = list()
+
 /datum/computer_file/program/design_writer/on_startup(var/mob/living/user, var/datum/extension/interactive/os/new_host)
-	..()
+	. = ..()
 	for(var/T in file_sources)
 		file_sources[T] = new T(new_host)
-	current_filesource = file_sources[initial(current_filesource)]
+
+	var/datum/computer_network/network = new_host.get_network()
+	if(network)
+		// Autoselect a research server if available.
+		var/list/accesses = new_host.get_access(user)
+		var/list/file_servers = network.get_file_server_tags(MF_ROLE_DESIGN, accesses)
+		if(file_servers.len)
+			var/datum/file_storage/network/net_fs = file_sources[/datum/file_storage/network]
+			net_fs.server = file_servers[1]
+			current_filesource = net_fs
+	
+	if(!current_filesource)
+		current_filesource = file_sources[/datum/file_storage/disk]
+	
+	cache_recipes()
 
 /datum/computer_file/program/design_writer/on_shutdown()
 	for(var/T in file_sources)
 		var/datum/file_storage/FS = file_sources[T]
 		qdel(FS)
 		file_sources[T] = null
-	current_filesource = initial(current_filesource)
+	current_filesource = null
 	ui_header = null
 
 	current_design = null
@@ -57,6 +73,7 @@
 
 	current_page = 1
 	search_string = null
+	cached_recipe_data.Cut()
 
 	prog_mode = MODE_LISTING
 	error = null
@@ -81,16 +98,18 @@
 	if(prog_mode == MODE_LISTING)
 		if(href_list["PRG_select_fab_type"])
 			var/choice = input(user, "Select the fabricator category you would like to view.") as null|anything in SSfabrication.research_recipes
-			if(choice && CanInteract(usr,state))
+			if(choice && (choice != selected_fab_type) && CanInteract(usr,state))
 				selected_fab_type = choice
 				current_page = 1
+				cache_recipes()
 			return TOPIC_REFRESH
 
 		if(href_list["PRG_search"])
 			var/new_search_string = sanitize(input(user, "Enter a new search string.", "Research search") as text|null)
-			if(CanInteract(user, state))
+			if(CanInteract(user, state) && (new_search_string != search_string))
 				search_string = new_search_string
 				current_page = 1
+				cache_recipes()
 				return TOPIC_REFRESH
 			return TOPIC_HANDLED
 
@@ -142,7 +161,7 @@
 					if(!network)
 						return TOPIC_REFRESH
 					// Helper for some user-friendliness. Try to select the first available mainframe.
-					var/list/file_servers = network.get_file_server_tags()
+					var/list/file_servers = network.get_file_server_tags(MF_ROLE_DESIGN, computer.get_access(user))
 					if(!file_servers.len)
 						return TOPIC_REFRESH
 					var/datum/file_storage/network/N = current_filesource
@@ -154,7 +173,7 @@
 			var/datum/computer_network/network = computer.get_network()
 			if(!network)
 				return
-			var/list/file_servers = network.get_file_server_tags(user)
+			var/list/file_servers = network.get_file_server_tags(MF_ROLE_DESIGN, computer.get_access(user))
 			var/file_server = input(usr, "Choose a fileserver to view files on:", "Select File Server") as null|anything in file_servers
 			if(file_server)
 				var/datum/file_storage/network/N = file_sources[/datum/file_storage/network]
@@ -236,6 +255,9 @@
 			var/feedback = current_design.select_theory(selected, analyzed, user)
 			if(feedback)
 				to_chat(user, SPAN_WARNING(feedback))
+			if(current_design.progressing)
+				// Little bit of feedback that they've progressed the design
+				sound_to(user, 'sound/effects/bells.ogg')
 			return TOPIC_REFRESH
 
 		if(href_list["PRG_discard_theory"])
@@ -250,6 +272,24 @@
 			current_design.use_free_point(href_list["PRG_add_point"])
 			return TOPIC_REFRESH
 
+/datum/computer_file/program/design_writer/proc/cache_recipes()
+	cached_recipe_data.Cut()
+	if(!selected_fab_type)
+		return
+	var/list/recipe_list = SSfabrication.research_recipes[selected_fab_type]
+	if(islist(recipe_list))
+		for(var/datum/fabricator_recipe/recipe in recipe_list)
+			var/recipe_name = recipe.get_product_name()
+			if(search_string && !findtextEx_char(lowertext(recipe_name), lowertext(search_string)))
+				continue
+			
+			var/list/recipe_data = list(
+				"name" = recipe_name,
+				"ref" = "\ref[recipe]"
+			)
+
+			cached_recipe_data += list(recipe_data)
+
 /datum/computer_file/program/design_writer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = global.default_topic_state)
 	. = ..()
 	if(!.)
@@ -267,32 +307,21 @@
 		data["search_string"] =  search_string || "No search filter set."
 		data["recipe_listing"] = list()
 
-		var/list/recipe_list = SSfabrication.research_recipes[selected_fab_type]
-		if(islist(recipe_list))
-			var/max_pages = CEILING(length(recipe_list)/RECIPES_PER_PAGE)
+		if(length(cached_recipe_data))
+
+			var/total_recipes = length(cached_recipe_data)
+
+			var/max_pages = CEILING(total_recipes/RECIPES_PER_PAGE)
 			current_page = clamp(current_page, 1, max_pages)
-			data["current_page"] = current_page
-						
-			var/curr_index = (current_page - 1)*RECIPES_PER_PAGE + 1
-			recipe_list = recipe_list.Copy(curr_index)
-
-			var/recipe_no = 0
-			while(recipe_no <= RECIPES_PER_PAGE && (curr_index <= length(recipe_list)))
-				var/datum/fabricator_recipe/recipe = recipe_list[curr_index]
-				var/recipe_name = recipe.get_product_name()
-				curr_index += 1
-				if(search_string && !findtextEx_char(lowertext(recipe_name), lowertext(search_string)))
-					continue
-				var/list/recipe_data = list(
-					"name" = recipe_name,
-					"ref" = "\ref[recipe]"
-				)
-				data["recipe_listing"] += list(recipe_data)
-				recipe_no += 1
-
-			if(curr_index > length(recipe_list))
-				data["max_page"] = TRUE
+			var/start_index = (current_page - 1)*RECIPES_PER_PAGE + 1
+			
+			data["recipe_listing"] = cached_recipe_data.Copy(start_index, min(total_recipes, start_index + RECIPES_PER_PAGE))
 
+			if(current_page == max_pages)
+				data["max_page"] = TRUE
+		
+		data["current_page"] = current_page
+	
 	else if(prog_mode == MODE_RECIPE)
 		if(current_recipe)
 			data["current_recipe"] = current_recipe.get_product_name()

mods/persistence/modules/science/recipe.dm

@@ -6,6 +6,8 @@
 
 	var/instability = 0
 
+	var/research_excluded = FALSE
+
 /datum/fabricator_recipe/build(turf/location, datum/fabricator_build_order/order)
 	if(length(finishing_requirements))
 		. = list()

mods/persistence/modules/science/research_overrides.dm

@@ -0,0 +1,19 @@
+// Overrides for the tech requirements of items and the exclusion of certain recipes
+
+/obj/item/stock_parts/circuitboard/router
+	origin_tech = "{'programming':1,'magnets':1}"
+
+/obj/item/stock_parts/circuitboard/mainframe
+	origin_tech = "{'programming':1}"
+
+/obj/item/stock_parts/subspace/filter
+	origin_tech = "{'programming':1,'magnets':1}"
+
+/datum/fabricator_recipe/imprinter/circuit/shuttle
+	research_excluded = TRUE
+
+/datum/fabricator_recipe/imprinter/ai
+	research_excluded = TRUE
+
+/datum/fabricator_recipe/imprinter/ai_core
+	research_excluded = TRUE