Factorio Forums

Code: Select all

script.on_event(defines.events.on_force_created, function(event)
	if global.researchQ == nil then init() end
	if global.researchQ[event.force.name] == nil then global.researchQ[event.force.name] = {} end
	if global.labs[event.force.name] == nil then global.labs[event.force.name] = find_entity({type = "lab", force = event.force}) end
end)

Code: Select all

diff --git a/functions/draw_grid.lua b/functions/draw_grid.lua
index f248b77..8f2d008 100644
--- a/functions/draw_grid.lua
+++ b/functions/draw_grid.lua
@@ -46,16 +46,40 @@ function technologies(player)
 	if global.showIcon[player.index] then colSpan = set_colspan else colSpan = math.floor(set_colspan / 3) end --create a smaller table if text is displayed.
 	local rq_table = player.gui.center.Q.add2q.add{type = "table", name = "add2q_table", style = "rq-table1", colspan = colSpan}
 	local count = 0
+
+	local banned_sciences = {} -- create a table of research ingredients that the research may not have.
+	for item, science in pairs(global.science) do
+		if not science[player.index] then table.insert(banned_sciences, item) end
+	end
+
 	for name, tech in pairs(player.force.technologies) do
-		if tech.enabled and (not tech.researched or global.showResearched[player.index]) then --checks if the research is enabled and either not completed or if it should show completed.
-			if (global.showExtended[player.index] or not tech.upgrade or not any(tech.prerequisites, "upgrade") or any(tech.prerequisites, "researched") or matches(tech.prerequisites, "name", global.researchQ[player.force.name])) then
-			-- ^checks if the research is an upgrade technology and whether or not to show it.
-				local t = {} -- create a table of research ingredients that the research may not have.
-				for item, science in pairs(global.science) do
-					if not science[player.index] then table.insert(t, item) end
-				end
+
+		if tech.enabled and -- only show researchable tech
+		(not tech.researched or global.showResearched[player.index]) then -- optionally show researched tech
+
+			if global.showExtended[player.index] or -- optionally show all reachable techs
+				not tech.upgrade or -- don't show upgrades by default
+				not any(tech.prerequisites, "upgrade") or -- don't show techs with upgrade prereqs by default
+				all(tech.prerequisites, "researched") or -- do show techs with researched pre-requisites
+				matches(tech.prerequisites, "name", global.researchQ[player.force.name]) -- do show already queued techs
+			then
 				
-				if not matches(tech.research_unit_ingredients, "name", t) then --checks if any on the research ingredients match the banned list
+				-- check if any of the research ingredients match the banned list, including pre-requisites
+				banned_science = false
+				techs_to_check = {tech}
+				while #techs_to_check > 0 do
+					local t = techs_to_check[#techs_to_check]
+					if matches(t.research_unit_ingredients, "name", banned_sciences) then
+						banned_science = true
+						break
+					end
+					table.remove(techs_to_check,#techs_to_check)
+					for _,new_t in pairs(t.prerequisites) do
+						techs_to_check[#techs_to_check+1] = new_t
+					end
+				end
+
+				if not banned_science then
 					local background1, background2 = nil, nil --select the right (color) of background depending on the status of the technology (done/available or in queue)
 					if tech.researched then 
 						background1 = "rq-done-frame"

Code: Select all

diff --git a/control.lua b/control.lua
index de7ee8c..b5889ca 100644
--- a/control.lua
+++ b/control.lua
@@ -5,6 +5,12 @@ require("functions.draw_grid")
 require("functions.initialise")
 
 script.on_configuration_changed(function(event)
+
+	-- mini-Migration
+	if global.showRecipesOnly == nil then 
+		global.showRecipesOnly = {}
+	end
+	
 	if event.mod_changes ~= nil and event.mod_changes["research-queue"] ~= nil then
 		init()
 		for index, _ in pairs(game.players) do
@@ -86,6 +92,10 @@ script.on_event(defines.events.on_gui_click, function(event)
 		global.showResearched[player.index] = not global.showResearched[player.index]
 		drawGrid(force)
 		
+	elseif event.element.name == "rq-showrecipesonly" then
+		global.showRecipesOnly[player.index] = not global.showRecipesOnly[player.index]
+		drawGrid(force)
+		
 	elseif event.element.name == "rqextend-button" then
 		global.showExtended[player.index] = not global.showExtended[player.index]
 		if not global.showExtended[player.index] then global.offset_tech[player.index] = 0 end
diff --git a/functions/draw_grid.lua b/functions/draw_grid.lua
index 8f2d008..aa7190c 100644
--- a/functions/draw_grid.lua
+++ b/functions/draw_grid.lua
@@ -29,6 +29,8 @@ function options(player)
 	
 	options.add{type = "checkbox", name = "rqscience", style = "rq-scienceDone-checkbox", state = not global.showResearched[player.index]}
 	
+	options.add{type = "checkbox", name = "rq-showrecipesonly", style = "rq-showrecipesonly-checkbox", state = global.showRecipesOnly[player.index]}
+	
 	for name, science in pairs(global.science) do
 		if global.showExtended[player.index] or not (global.bobsmodules[name] or global.bobsaliens[name]) then
 			options.add{type = "checkbox", name = "rq-science"..name, style = "rq-tool"..name, state = not science[player.index]}
@@ -40,6 +42,15 @@ function options(player)
 	end
 end
 
+function techHasRecipes(tech)
+	for k,v in pairs(tech.effects) do
+		if v.type=="unlock-recipe" then
+			return true
+		end
+	end
+	return false
+end
+
 function technologies(player)
 	local caption = player.gui.center.Q.add2q.add{type = "label", name = "add2q_caption", caption = "List of technologies"} 
 	caption.style.minimal_width = set_colspan * 68
@@ -55,7 +66,8 @@ function technologies(player)
 	for name, tech in pairs(player.force.technologies) do
 
 		if tech.enabled and -- only show researchable tech
-		(not tech.researched or global.showResearched[player.index]) then -- optionally show researched tech
+		(not tech.researched or global.showResearched[player.index]) and -- optionally show researched tech
+		(techHasRecipes(tech) or not global.showRecipesOnly[player.index]) then
 
 			if global.showExtended[player.index] or -- optionally show all reachable techs
 				not tech.upgrade or -- don't show upgrades by default
diff --git a/functions/initialise.lua b/functions/initialise.lua
index 2463faf..7b59ea0 100644
--- a/functions/initialise.lua
+++ b/functions/initialise.lua
@@ -10,6 +10,7 @@ function init()
 	end
 	if global.showIcon == nil then global.showIcon = {} end
 	if global.showResearched == nil then global.showResearched = {} end
+	if global.showRecipesOnly == nil then global.showRecipesOnly = {} end
 	if global.offset_queue == nil then global.offset_queue = {} end
 	if global.offset_tech == nil then global.offset_tech = {} end
 	if global.showExtended == nil then global.showExtended = {} end
@@ -47,6 +48,7 @@ function player_init(player_index)
 	if not game.players[player_index].gui.top.research_Q then game.players[player_index].gui.top.add{type = "button", name = "research_Q", caption = "RQ", style = "rq-top-button"} end
 	global.showIcon[player_index] = true
 	global.showResearched[player_index] = false
+	global.showRecipesOnly[player_index] = false
 	global.offset_queue[player_index] = 0
 	global.offset_tech[player_index] = 0
 	global.showExtended[player_index] = false
diff --git a/prototypes/gui.lua b/prototypes/gui.lua
index 36a8d5c..7f32e3c 100644
--- a/prototypes/gui.lua
+++ b/prototypes/gui.lua
@@ -1051,6 +1051,61 @@ data.raw["gui-style"].default["rq-scienceDone-checkbox"] =
 	}
 }
 
+data.raw["gui-style"].default["rq-showrecipesonly-checkbox"] = 
+{
+	type = "checkbox_style", 
+	top_padding = 0, 
+	right_padding = 0, 
+	bottom_padding = 0, 
+	left_padding = 0, 
+	width = 32, 
+	height = 32, 
+	scalable = false, 		
+	left_click_sound = 
+	{
+		{
+		filename = "__core__/sound/gui-click.ogg", 
+		volume = 1
+		}
+	}, 
+	default_background = 
+	{
+		filename = "__research-queue__/graphics/gui_elements.png", 
+		priority = "extra-high-no-scale", 
+		width = 32, 
+		height = 32, 
+		x = 32, 
+		y = 32
+	}, 
+	hovered_background = 
+	{
+		filename = "__research-queue__/graphics/gui_elements.png", 
+		priority = "extra-high-no-scale", 
+		width = 32, 
+		height = 32, 
+		x = 32, 
+		y = 32
+	}, 
+	clicked_background = 
+	{
+		filename = "__research-queue__/graphics/gui_elements.png", 
+		priority = "extra-high-no-scale", 
+		width = 32, 
+		height = 32, 
+		x = 32, 
+		y = 32
+	}, 
+	checked = 
+	{
+		filename = "__research-queue__/graphics/gui_elements.png", 
+		priority = "extra-high-no-scale", 
+		width = 32, 
+		height = 32, 
+		x = 96, 
+		y = 64
+	}
+}
+
 data.raw["gui-style"].default["rq-table1"] = 
 {
 	type = "table_style",