fix: eliminate unused/default prototype properties

kirazy/reskins-bobs#60

Author: kirazy

prototypes/entity/addons-storage/chests.lua

@@ -7,7 +7,7 @@
 local inputs = {
 	type = "container",
 	mod = "angels",
-	tint = util.color("403630"),
+	tint = util.color("#403630"),
 	icon_layers = 1,
 	make_remnants = false,
 	-- make_explosions = false,

prototypes/entity/addons-storage/logistics-chests.lua

@@ -13,11 +13,11 @@ local inputs = {
 }
 
 local logistic_map = {
-	["active-provider"] = { tint = util.color("760fd6") },
-	["buffer"] = { tint = util.color("00bf13") },
-	["passive-provider"] = { tint = util.color("ff0000") },
-	["requester"] = { tint = util.color("227dae") },
-	["storage"] = { tint = util.color("ba7713") },
+	["active-provider"] = { tint = util.color("#760fd6") },
+	["buffer"] = { tint = util.color("#00bf13") },
+	["passive-provider"] = { tint = util.color("#ff0000") },
+	["requester"] = { tint = util.color("#227dae") },
+	["storage"] = { tint = util.color("#ba7713") },
 }
 
 -- Reskin Warehouses

prototypes/entity/petrochem/petrochem-inline-tank.lua

@@ -15,7 +15,7 @@ local inputs = {
 	base_entity_name = "storage-tank",
 	mod = "angels",
 	group = "petrochem",
-	tint = util.color("c20600"), -- Red
+	tint = util.color("#c20600"), -- Red
 	icon_layers = 1,
 	particles = { ["big"] = 1 },
 	make_remnants = false,

prototypes/entity/petrochem/valve.lua

@@ -21,10 +21,10 @@ local inputs = {
 }
 
 local valves = {
-	["valve-inspector"] = { tint = util.color("8dd24e") },
-	["valve-overflow"] = { tint = util.color("689ed3") },
-	["valve-return"] = { tint = util.color("d4933f") },
-	["valve-underflow"] = { tint = util.color("fcfcfc") },
+	["valve-inspector"] = { tint = util.color("#8dd24e") },
+	["valve-overflow"] = { tint = util.color("#689ed3") },
+	["valve-return"] = { tint = util.color("#d4933f") },
+	["valve-underflow"] = { tint = util.color("#fcfcfc") },
 }
 
 local function cardinal_pictures(x, tint)
@@ -83,7 +83,7 @@ end
 -- Setup for one-off converter valve
 local name = "valve-converter"
 inputs.type = "furnace"
-inputs.tint = util.color("fdec2b")
+inputs.tint = util.color("#fdec2b")
 
 ---@type data.FurnacePrototype
 local entity = data.raw[inputs.type][name]

prototypes/entity/refining/ore-crusher.lua

@@ -20,7 +20,7 @@ local inputs = {
 }
 
 local tier_map = {
-	["burner-ore-crusher"] = { tier = 0, tint = util.color("262626"), is_burner = true },
+	["burner-ore-crusher"] = { tier = 0, tint = util.color("#262626"), is_burner = true },
 	["ore-crusher"] = { tier = 1 },
 	["ore-crusher-2"] = { tier = 2 },
 	["ore-crusher-3"] = { tier = 3 },

prototypes/entity/smelting/pipe.lua

@@ -74,10 +74,10 @@ end
 
 ---@type { [PipeNamePrefix]: PipeReskinParams }
 local pipe_material_map = {
-	["titanium"] = { material_type = "angels-titanium", tier = 4, tint = util.color("995f92") },
-	["ceramic"] = { material_type = "angels-ceramic", tier = 4, tint = util.color("ffffff") },
-	["tungsten"] = { material_type = "angels-tungsten", tier = 4, tint = util.color("7e5f45") },
-	["nitinol"] = { material_type = "angels-nitinol", tier = 5, tint = util.color("7664a9") },
+	["titanium"] = { material_type = "angels-titanium", tier = 4, tint = util.color("#995f92") },
+	["ceramic"] = { material_type = "angels-ceramic", tier = 4, tint = util.color("#ffffff") },
+	["tungsten"] = { material_type = "angels-tungsten", tier = 4, tint = util.color("#7e5f45") },
+	["nitinol"] = { material_type = "angels-nitinol", tier = 5, tint = util.color("#7664a9") },
 }
 
 -- Reskin pipes, create and assign extra details

prototypes/functions/functions.lua

@@ -15,7 +15,7 @@ reskins.angels.constants = {
 
 -- Maybe we'll use this one day?...
 local function copy_icon(destination_name, destination_type, source_name, source_type)
-	-- Fetch source and desination pointers
+	-- Fetch source and destination pointers
 	local source = data.raw[source_type]
 	local destination = data.raw[destination_type]
 
@@ -39,18 +39,18 @@ end
 
 -- Check to see if the new angels numbering function is available.
 local function check_add_number_icon_layer_is_available()
-	return angelsmods and angelsmods.functions.add_number_icon_layer({}, 1, util.get_color_with_alpha(util.color("000000"), 1))
+	return angelsmods and angelsmods.functions.add_number_icon_layer({}, 1, util.get_color_with_alpha(util.color("#000000"), 1))
 end
 
 local number_function_is_valid = pcall(check_add_number_icon_layer_is_available)
 
 ---comment
 ---@param tier integer
----@param mod string # The key to a specific Angel's mod subtable in the `angelsmods` global, e.g. `"smelting"`.
+---@param mod string # The key to a specific Angel's mod sub table in the `angelsmods` global, e.g. `"smelting"`.
 ---@return data.IconData[]
 function reskins.angels.num_tier(tier, mod)
 	-- Get the tint for the given mod; fallback to black if necessary
-	local tint = angelsmods and angelsmods[mod] and angelsmods[mod].number_tint or util.color("000000")
+	local tint = angelsmods and angelsmods[mod] and angelsmods[mod].number_tint or util.color("#000000")
 
 	local icons
 	if number_function_is_valid then

prototypes/items/smelting/ores.lua

@@ -69,7 +69,6 @@ for ore_name, parameters in pairs(ores) do
 	local icon_data = { {
 		icon = reskins[parameters.key].directory .. "/graphics/icons/" .. parameters.subfolder .. "/" .. ore_name .. "/" .. ore_name .. ".png",
 		icon_size = 64,
-		icon_miumaps = 4,
 		scale = 0.5,
 	} }
 
@@ -98,22 +97,22 @@ local function make_slag_processing_icon_base()
 		{
 			icon = "__angelsrefininggraphics__/graphics/icons/angels-liquid/liquid-recipe-base.png",
 			icon_size = 600,
-			tint = util.color("404040b2"),
+			tint = util.color("#404040b2"),
 		},
 		{
 			icon = "__angelsrefininggraphics__/graphics/icons/angels-liquid/liquid-recipe-top.png",
 			icon_size = 600,
-			tint = util.color("ca6311"),
+			tint = util.color("#ca6311"),
 		},
 		{
 			icon = "__angelsrefininggraphics__/graphics/icons/angels-liquid/liquid-recipe-mid.png",
 			icon_size = 600,
-			tint = util.color("613414"),
+			tint = util.color("#613414"),
 		},
 		{
 			icon = "__angelsrefininggraphics__/graphics/icons/angels-liquid/liquid-recipe-bot.png",
 			icon_size = 600,
-			tint = util.color("613414"),
+			tint = util.color("#613414"),
 		},
 	}
 end

prototypes/recipe-adjustments/refining/clarifier.lua

@@ -3,12 +3,12 @@
 --
 -- See LICENSE.md in the project directory for license information.
 
-local water_tint = util.color("005799") -- Water void recipe tint for water
-local mud_tint = util.color("6a492c") -- AR:Angel's tint for mud
+local water_tint = util.color("#005799") -- Water void recipe tint for water
+local mud_tint = util.color("#6a492c") -- AR:Angel's tint for mud
 
 -- Ensure a tint is formatted as expected by reskins.lib functions
----@param color table [Types/Color](https://wiki.factorio.com/Types/Color)
----@return table tint [Types/Color](https://wiki.factorio.com/Types/Color) with fields r, g, b, a
+---@param color data.Color
+---@return data.Color
 local function format_tint(color)
 	local tint = {
 		r = color.r or color[1],
@@ -21,11 +21,11 @@ local function format_tint(color)
 end
 
 -- Takes two input tints and blends them in the following manner: `A*w + B*(1-w)`
----@param tint_A table [Types/Color](https://wiki.factorio.com/Types/Color)
----@param tint_B table [Types/Color](https://wiki.factorio.com/Types/Color)
----@param weighting? number In the range 0:1, default 0.5
----@param alpha? number In the range 0:1, default 1
----@return table tint [Types/Color](https://wiki.factorio.com/Types/Color)
+---@param tint_A data.Color
+---@param tint_B data.Color
+---@param weighting? number # In the range 0:1, default 0.5
+---@param alpha? number # In the range 0:1, default 1
+---@return data.Color
 local function blend_colors(tint_A, tint_B, weighting, alpha)
 	local A = format_tint(tint_A)
 	local B = format_tint(tint_B)
@@ -74,7 +74,7 @@ end
 --                 end
 --             end
 
---             -- Fix the localisation, hnng...
+--             -- Fix the localisation...
 --             -- recipe_data.localised_name = {"", ingredient.localised_name, " void"}
 --         end
 --     end