Merge branch 'master' of https://github.com/Wyrrrd/IndustrialDisplayPlates

Fix styles

changelog.txt

@@ -1,4 +1,12 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.18.3
+Date: 2020-11-22
+  Changes:
+    - removed unneeded mipmap for map marker (thanks to Deadlock989)
+    - restored IR compat (thanks to Deadlock989)
+    - fixed steel display migration (again) (thanks to Deadlock989)
+    - fixed styles (thanks to Deadlock989)
+---------------------------------------------------------------------------------------------------
 Version: 0.18.2
 Date: 2020-08-02
   Changes:

control.lua

@@ -359,7 +359,7 @@ local function create_display_gui(player, selected)
 	local content_frame = frame.add {
 		type = "frame",
 		name = "inner-frame",
-		style = "display_deep_frame",
+		style = "display_inside_frame",
 		direction = "vertical",
 	}
 	content_frame.style.top_margin = 8
@@ -469,15 +469,15 @@ local function set_up_display_from_ghost(entity,tags)
 	end
 end
 
-local function reset_globals()
+-- local function reset_globals()
-	global.translations = nil
+	-- global.translations = nil
-end
+-- end
 
 ------------------------------------------------------------------------------------------------------------------------------------------------------
 
 -- event handlers
 
-script.on_configuration_changed(reset_globals)
+-- script.on_configuration_changed(reset_globals)
 script.on_event(defines.events.on_gui_closed, gui_close)
 script.on_event(defines.events.on_gui_click, gui_click)
 script.on_event(defines.events.on_player_mined_entity, event_raised_destroy, get_display_event_filter())

data.lua

@@ -125,7 +125,7 @@ for display,displaydata in pairs(DID.displays) do
 			result = display,
 			result_count = 1,
 			category = "crafting",
-			enabled = mods["IndustrialRevolution"] and (displaydata.IR_unlock == nil) or (displaydata.unlock == nil),
+			enabled = (mods["IndustrialRevolution"] and (displaydata.IR_unlock == nil)) or (not mods["IndustrialRevolution"] and displaydata.unlock == nil),
 			ingredients = displaydata.ingredients,
 			energy_required = 1,
 		}
@@ -158,11 +158,11 @@ add_styles({
             left_padding = 10,
             right_padding = 10,
             top_padding = 8,
-            graphical_set = data.raw["gui-style"]["default"]["tabbed_pane"]["tab_content_frame"].graphical_set,
             type = "frame_style",
+			graphical_set = data.raw["gui-style"]["default"]["filter_tabbed_pane"]["tab_content_frame"].graphical_set,
         },
         type = "tabbed_pane_style",
-        parent = "tabbed_pane",
+        parent = "filter_tabbed_pane",
         width = 420,
     },
     display_tab = {
@@ -185,9 +185,9 @@ add_styles({
             horizontal_align = "center",
         },
     },
-    display_deep_frame = {
+    display_inside_frame = {
         type = "frame_style",
-        parent = "inside_deep_frame",
+		parent = "inside_shallow_frame",
         vertical_flow_style = {
             type = "vertical_flow_style",
             vertical_spacing = 0,
@@ -196,34 +196,7 @@ add_styles({
     },
     display_tab_deep_frame = {
         type = "frame_style",
-        parent = "subpanel_inset_frame",
+        parent = "slot_button_deep_frame",
-        vertical_flow_style = {
-            type = "vertical_flow_style",
-            vertical_spacing = 0,
-            padding = 0,
-        },
-        graphical_set = {
-          base = {
-            center = {
-              position = {42,8},
-              size = {1,1},
-            },
-            corner_size = 8,
-            draw_type = "outer",
-            position = {85,0},
-          },
-		  shadow = data.raw["gui-style"]["default"]["inside_deep_frame"].graphical_set.shadow,
-        },
-        background_graphical_set = {
-            corner_size = 8,
-            overall_tiling_horizontal_padding = 5,
-            overall_tiling_horizontal_size = 30,
-            overall_tiling_horizontal_spacing = 10,
-            overall_tiling_vertical_padding = 5,
-            overall_tiling_vertical_size = 30,
-            overall_tiling_vertical_spacing = 10,
-            position = { 282, 17 },
-        },
     },
     display_buttons = {
         type = "table_style",
@@ -289,8 +262,6 @@ data:extend({
         priority = "extra-high",
         width = 32,
         height = 32,
-        mipmap_count = 2,
-		scale = 0.5,
 	flags = {"gui-icon"},
     },
     {

globals.lua

@@ -20,30 +20,30 @@ return {
 		},
 		["iron-display-small"] = {
 			ingredients = {{"iron-plate",1}},
-			IR_unlock = "deadlock-iron-age",
+			IR_unlock = "ir2-iron-milestone",
 		},
 		["iron-display-medium"] = {
 			ingredients = {{"iron-plate",4}},
-			IR_unlock = "deadlock-iron-age",
+			IR_unlock = "ir2-iron-milestone",
 		},
 		["iron-display"] = {
 			ingredients = {{"iron-plate",9}},
-			IR_unlock = "deadlock-iron-age",
+			IR_unlock = "ir2-iron-milestone",
 		},
 		["steel-display-small"] = {
 			ingredients = {{"steel-plate",1}},
 			unlock = "steel-processing",
-			IR_unlock = "deadlock-steel-age",
+			IR_unlock = "ir2-steel-milestone",
 		},
 		["steel-display-medium"] = {
 			ingredients = {{"steel-plate",4}},
 			unlock = "steel-processing",
-			IR_unlock = "deadlock-steel-age",
+			IR_unlock = "ir2-steel-milestone",
 		},
 		["steel-display"] = {
 			ingredients = {{"steel-plate",9}},
 			unlock = "steel-processing",
-			IR_unlock = "deadlock-steel-age",
+			IR_unlock = "ir2-steel-milestone",
 		},
 	},
 	sizes = {

info.json

@@ -1,11 +1,12 @@
 {
 	"name": "IndustrialDisplayPlates",
-	"version": "0.18.2",
+	"version": "0.18.3",
 	"title": "Industrial Display Plates",
 	"author": "Wyrrrd",
 	"homepage": "https://github.com/Wyrrrd/IndustrialDisplayPlates",
 	"dependencies": [
-		"base >= 0.18.27"
+		"base >= 0.18.27",
+		"(?)IndustrialRevolution"
 	],
 	"description": "Big, medium and small signs which display item and fluid icons. Can be used to blueprint map markers.",
 	"factorio_version": "0.18"

migrations/steel-display.lua

@@ -1,11 +1,11 @@
+local DID = require("globals")
+
 for index, force in pairs(game.forces) do
-  local technologies = force.technologies
+    for display,displaydata in pairs(DID.displays) do
-  local recipes = force.recipes
+        if displaydata.IR_unlock and force.technologies[displaydata.IR_unlock] and force.technologies[displaydata.IR_unlock].researched then
-
+            force.recipes[display].enabled = true
-  if technologies["steel-processing"].researched then
+        elseif displaydata.unlock and force.technologies[displaydata.unlock] and force.technologies[displaydata.unlock].researched then
-    recipes["steel-display-small"].enabled = true
+            force.recipes[display].enabled = true
-    recipes["steel-display-medium"].enabled = true
+        end
-    recipes["steel-display"].enabled = true
     end
-
 end