diff --git a/prototypes/248k_fluids.lua b/prototypes/248k_fluids.lua index e6509ea..16d8259 100644 --- a/prototypes/248k_fluids.lua +++ b/prototypes/248k_fluids.lua @@ -188,7 +188,7 @@ data:extend({ pressure_to_speed_ratio = 0.400, flow_to_energy_ratio = 0, subgroup = 'fu_item_subgroup_e', - order = 'a-a', + order = 'a-c', }, { name = 'fu_lead_fluid_cold', @@ -203,7 +203,7 @@ data:extend({ pressure_to_speed_ratio = 0.400, flow_to_energy_ratio = 0, subgroup = 'fu_item_subgroup_e', - order = 'a-a', + order = 'a-c', }, { name = 'el_dirty_water', diff --git a/prototypes/el_recipes.lua b/prototypes/el_recipes.lua index 2d5b1a6..ae79e28 100644 --- a/prototypes/el_recipes.lua +++ b/prototypes/el_recipes.lua @@ -175,6 +175,15 @@ data:extend({ }, result_count = 1, energy_required = 5, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/fluids/el_kerosene.png" + }, + { + icon = "__248k__/ressources/icons/overlay_2.png" + } + } }, { name = 'el_tank_recipe', @@ -503,6 +512,15 @@ data:extend({ {type="fluid", name="el_ki_memory_fluid", amount=200, temperature =500}, }, energy_required = 20, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/fluids/el_ki_memory_fluid.png" + }, + { + icon = "__248k__/ressources/icons/overlay_1.png" + } + } }, { name = 'el_ki_memory_fluid_recipe_1', @@ -520,6 +538,15 @@ data:extend({ {type="fluid", name="el_ki_memory_fluid", amount=200, temperature =500}, }, energy_required = 20, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/fluids/el_ki_memory_fluid.png" + }, + { + icon = "__248k__/ressources/icons/overlay_2.png" + } + } }, { name = 'el_ki_memory_fluid_recipe_2', @@ -537,6 +564,15 @@ data:extend({ {type="fluid", name="el_ki_memory_fluid", amount=200, temperature =500}, }, energy_required = 20, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/fluids/el_ki_memory_fluid.png" + }, + { + icon = "__248k__/ressources/icons/overlay_3.png" + } + } }, { name = 'el_ki_memory_fluid_recipe_3', @@ -553,6 +589,15 @@ data:extend({ {type="fluid", name="el_ki_memory_fluid", amount=200, temperature =500}, }, energy_required = 20, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/fluids/el_ki_memory_fluid.png" + }, + { + icon = "__248k__/ressources/icons/overlay_4.png" + } + } }, { name = 'fu_ki_circuit_fluid_recipe', @@ -569,6 +614,15 @@ data:extend({ {type="fluid", name="fu_ki_circuit_fluid", amount=200, temperature =500}, }, energy_required = 20, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/fluids/fu_ki_circuit_fluid.png" + }, + { + icon = "__248k__/ressources/icons/overlay_1.png" + } + } }, { name = 'fu_ki_circuit_fluid_recipe_1', @@ -585,6 +639,15 @@ data:extend({ {type="fluid", name="fu_ki_circuit_fluid", amount=200, temperature =500}, }, energy_required = 20, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/fluids/fu_ki_circuit_fluid.png" + }, + { + icon = "__248k__/ressources/icons/overlay_2.png" + } + } }, { name = 'fu_ki_circuit_fluid_recipe_2', @@ -600,6 +663,15 @@ data:extend({ {type="fluid", name="fu_ki_circuit_fluid", amount=200, temperature =500}, }, energy_required = 20, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/fluids/fu_ki_circuit_fluid.png" + }, + { + icon = "__248k__/ressources/icons/overlay_3.png" + } + } }, { name = 'fu_ki_circuit_fluid_recipe_3', @@ -615,6 +687,15 @@ data:extend({ {type="fluid", name="fu_ki_circuit_fluid", amount=200, temperature =500}, }, energy_required = 20, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/fluids/fu_ki_circuit_fluid.png" + }, + { + icon = "__248k__/ressources/icons/overlay_4.png" + } + } }, { name = 'fi_ki_circuit_fluid_recipe', @@ -631,6 +712,15 @@ data:extend({ {type="fluid", name="fi_ki_circuit_fluid", amount=200, temperature =500}, }, energy_required = 20, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/fluids/fi_ki_circuit_fluid.png" + }, + { + icon = "__248k__/ressources/icons/overlay_1.png" + } + } }, { name = 'fi_ki_circuit_fluid_recipe_1', @@ -647,6 +737,15 @@ data:extend({ {type="fluid", name="fi_ki_circuit_fluid", amount=200, temperature =500}, }, energy_required = 20, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/fluids/fi_ki_circuit_fluid.png" + }, + { + icon = "__248k__/ressources/icons/overlay_2.png" + } + } }, { name = 'fi_ki_circuit_fluid_recipe_2', @@ -662,6 +761,15 @@ data:extend({ {type="fluid", name="fi_ki_circuit_fluid", amount=200, temperature =500}, }, energy_required = 20, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/fluids/fi_ki_circuit_fluid.png" + }, + { + icon = "__248k__/ressources/icons/overlay_3.png" + } + } }, { name = 'fi_ki_circuit_fluid_recipe_3', @@ -676,6 +784,15 @@ data:extend({ {type="fluid", name="fi_ki_circuit_fluid", amount=200, temperature =500}, }, energy_required = 20, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/fluids/fi_ki_circuit_fluid.png" + }, + { + icon = "__248k__/ressources/icons/overlay_4.png" + } + } }, --el_ki_cpu_entity { @@ -693,7 +810,7 @@ data:extend({ {type="item", name="el_ki_cpu_item", amount=1}, }, result_count = 1, - energy_required = 30, + energy_required = 30, }, --el_ki_cpu_fluid { @@ -712,6 +829,15 @@ data:extend({ {type="fluid", name="el_ki_cpu_fluid", amount=200, temperature =500}, }, energy_required = 20, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/fluids/el_ki_cpu_fluid.png" + }, + { + icon = "__248k__/ressources/icons/overlay_1.png" + } + } }, { name = 'el_ki_cpu_fluid_recipe_1', @@ -729,6 +855,15 @@ data:extend({ {type="fluid", name="el_ki_cpu_fluid", amount=200, temperature =500}, }, energy_required = 20, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/fluids/el_ki_cpu_fluid.png" + }, + { + icon = "__248k__/ressources/icons/overlay_2.png" + } + } }, { name = 'el_ki_cpu_fluid_recipe_2', @@ -746,6 +881,15 @@ data:extend({ {type="fluid", name="el_ki_cpu_fluid", amount=200, temperature =500}, }, energy_required = 20, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/fluids/el_ki_cpu_fluid.png" + }, + { + icon = "__248k__/ressources/icons/overlay_3.png" + } + } }, { name = 'el_ki_cpu_fluid_recipe_3', @@ -762,6 +906,15 @@ data:extend({ {type="fluid", name="el_ki_cpu_fluid", amount=200, temperature =500}, }, energy_required = 20, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/fluids/el_ki_cpu_fluid.png" + }, + { + icon = "__248k__/ressources/icons/overlay_4.png" + } + } }, --el_ki_core_cpu_memory @@ -889,7 +1042,16 @@ data:extend({ {type="item", name="el_materials_pure_aluminum", amount=2}, }, energy_required = 1, - always_show_made_in = true + always_show_made_in = true, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/fluids/el_dirty_water.png" + }, + { + icon = "__248k__/ressources/icons/overlay_stone.png" + } + } }, { name = 'el_purify_stone_2_recipe', @@ -907,7 +1069,17 @@ data:extend({ {type="item", name="el_materials_pure_aluminum", amount=2}, }, energy_required = 1, - always_show_made_in = true + always_show_made_in = true, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/fluids/el_dirty_water.png" + }, + { + icon = "__248k__/ressources/icons/overlay_stone.png" + } + } + }, { name = 'el_purify_iron_recipe', @@ -925,7 +1097,17 @@ data:extend({ {type="item", name="el_materials_pure_iron", amount=5}, }, energy_required = 1, - always_show_made_in = true + always_show_made_in = true, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/fluids/el_dirty_water.png" + }, + { + icon = "__248k__/ressources/icons/overlay_iron.png" + } + } + }, { name = 'el_purify_copper_recipe', @@ -943,7 +1125,16 @@ data:extend({ {type="item", name="el_materials_pure_copper", amount=5}, }, energy_required = 1, - always_show_made_in = true + always_show_made_in = true, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/fluids/el_dirty_water.png" + }, + { + icon = "__248k__/ressources/icons/overlay_copper.png" + } + } }, { name = 'el_purify_stone_acidic_recipe', @@ -1234,6 +1425,15 @@ data:extend({ }, result_count = 1, energy_required = 5, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/fluids/el_kerosene.png" + }, + { + icon = "__248k__/ressources/icons/overlay_1.png" + } + } }, { name = 'el_charger_recipe', diff --git a/prototypes/fi_recipes.lua b/prototypes/fi_recipes.lua index b55d3a8..f4448f9 100644 --- a/prototypes/fi_recipes.lua +++ b/prototypes/fi_recipes.lua @@ -852,7 +852,18 @@ data:extend({ {type="item", name="el_materials_pure_copper", amount=3}, }, energy_required = 2, - always_show_made_in = true + always_show_made_in = true, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/fluids/fi_dirty_water.png" + }, + { + icon = "__248k__/ressources/icons/overlay_stone.png" + } + }, + subgroup = 'fi_item_subgroup_f', + order = 'a-a', }, { name = 'fi_purify_iron_recipe', @@ -872,7 +883,18 @@ data:extend({ {type="item", name="el_materials_pure_iron", amount=39} }, energy_required = 16, - always_show_made_in = true + always_show_made_in = true, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/fluids/fi_dirty_water.png" + }, + { + icon = "__248k__/ressources/icons/overlay_iron.png" + } + }, + subgroup = 'fi_item_subgroup_f', + order = 'a-a', }, { name = 'fi_purify_copper_recipe', @@ -892,7 +914,18 @@ data:extend({ {type="item", name="el_materials_pure_copper", amount=39} }, energy_required = 16, - always_show_made_in = true + always_show_made_in = true, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/fluids/fi_dirty_water.png" + }, + { + icon = "__248k__/ressources/icons/overlay_copper.png" + } + }, + subgroup = 'fi_item_subgroup_f', + order = 'a-a', }, { name = 'fi_purify_uranium_recipe', @@ -913,7 +946,18 @@ data:extend({ {type="item", name="uranium-235", amount=1}, }, energy_required = 20, - always_show_made_in = true + always_show_made_in = true, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/fluids/fi_dirty_water.png" + }, + { + icon = "__248k__/ressources/icons/overlay_uranium.png" + } + }, + subgroup = 'fi_item_subgroup_f', + order = 'a-a', }, diff --git a/prototypes/fu_recipes.lua b/prototypes/fu_recipes.lua index 81fdffc..3a96fed 100644 --- a/prototypes/fu_recipes.lua +++ b/prototypes/fu_recipes.lua @@ -174,6 +174,17 @@ data:extend({ result_count = 1, energy_required = 1, always_show_made_in = true, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/elements/fu_hydrogen.png" + }, + { + icon = "__248k__/ressources/icons/overlay_1.png" + } + }, + subgroup = 'fu_item_subgroup_e', + order = 'a-a-a', }, { name = 'fu_boiler_hydrogen_oxygen_1_recipe', @@ -191,6 +202,17 @@ data:extend({ result_count = 1, energy_required = 1, always_show_made_in = true, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/elements/fu_hydrogen.png" + }, + { + icon = "__248k__/ressources/icons/overlay_2.png" + } + }, + subgroup = 'fu_item_subgroup_e', + order = 'a-a-b', }, { name = 'fu_boiler_hydrogen_oxygen_2_recipe', @@ -208,6 +230,17 @@ data:extend({ result_count = 1, energy_required = 1, always_show_made_in = true, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/elements/fu_hydrogen.png" + }, + { + icon = "__248k__/ressources/icons/overlay_3.png" + } + }, + subgroup = 'fu_item_subgroup_e', + order = 'a-a-c', }, { name = 'fu_boiler_hydrogen_oxygen_3_recipe', @@ -224,6 +257,17 @@ data:extend({ result_count = 1, energy_required = 1, always_show_made_in = true, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/elements/fu_hydrogen.png" + }, + { + icon = "__248k__/ressources/icons/overlay_4.png" + } + }, + subgroup = 'fu_item_subgroup_e', + order = 'a-a-d', }, { name = 'fu_hydrogen_recipe', @@ -1732,6 +1776,17 @@ data:extend({ result_count = 1, energy_required = 5, always_show_made_in = true, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/elements/fu_hydrogen.png" + }, + { + icon = "__248k__/ressources/icons/overlay_1.png" + } + }, + subgroup = 'fu_item_subgroup_e', + order = 'a-b-a', }, { name = 'fu_charger_hydrogen_oxygen_1_recipe', @@ -1751,6 +1806,17 @@ data:extend({ result_count = 1, energy_required = 5, always_show_made_in = true, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/elements/fu_hydrogen.png" + }, + { + icon = "__248k__/ressources/icons/overlay_2.png" + } + }, + subgroup = 'fu_item_subgroup_e', + order = 'a-b-b', }, { name = 'fu_charger_hydrogen_oxygen_2_recipe', @@ -1770,6 +1836,17 @@ data:extend({ result_count = 1, energy_required = 5, always_show_made_in = true, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/elements/fu_hydrogen.png" + }, + { + icon = "__248k__/ressources/icons/overlay_3.png" + } + }, + subgroup = 'fu_item_subgroup_e', + order = 'a-b-c', }, { name = 'fu_charger_hydrogen_oxygen_3_recipe', @@ -1786,5 +1863,16 @@ data:extend({ result_count = 1, energy_required = 5, always_show_made_in = true, + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/elements/fu_hydrogen.png" + }, + { + icon = "__248k__/ressources/icons/overlay_4.png" + } + }, + subgroup = 'fu_item_subgroup_e', + order = 'a-b-d', }, }) \ No newline at end of file diff --git a/ressources/fission/fi_fuel/fi_fuel_advanced_item.png b/ressources/fission/fi_fuel/fi_fuel_advanced_item.png index 4b77d67..c44a55a 100644 Binary files a/ressources/fission/fi_fuel/fi_fuel_advanced_item.png and b/ressources/fission/fi_fuel/fi_fuel_advanced_item.png differ diff --git a/ressources/fission/fi_fuel/fi_fuel_advanced_thorium_item.png b/ressources/fission/fi_fuel/fi_fuel_advanced_thorium_item.png index a4aeb54..52f1ae0 100644 Binary files a/ressources/fission/fi_fuel/fi_fuel_advanced_thorium_item.png and b/ressources/fission/fi_fuel/fi_fuel_advanced_thorium_item.png differ diff --git a/ressources/fission/fi_fuel/fi_fuel_basic_item.png b/ressources/fission/fi_fuel/fi_fuel_basic_item.png index 7431025..9c2272f 100644 Binary files a/ressources/fission/fi_fuel/fi_fuel_basic_item.png and b/ressources/fission/fi_fuel/fi_fuel_basic_item.png differ diff --git a/ressources/fission/fi_fuel/fi_fuel_basic_thorium_item.png b/ressources/fission/fi_fuel/fi_fuel_basic_thorium_item.png index 54fadf3..2d1122f 100644 Binary files a/ressources/fission/fi_fuel/fi_fuel_basic_thorium_item.png and b/ressources/fission/fi_fuel/fi_fuel_basic_thorium_item.png differ diff --git a/ressources/fission/fi_fuel/fi_fuel_plutonium239_item.png b/ressources/fission/fi_fuel/fi_fuel_plutonium239_item.png index a49bcc4..067eba2 100644 Binary files a/ressources/fission/fi_fuel/fi_fuel_plutonium239_item.png and b/ressources/fission/fi_fuel/fi_fuel_plutonium239_item.png differ diff --git a/ressources/fission/fi_fuel/fi_fuel_pure_item.png b/ressources/fission/fi_fuel/fi_fuel_pure_item.png index 5ceca09..12f61fb 100644 Binary files a/ressources/fission/fi_fuel/fi_fuel_pure_item.png and b/ressources/fission/fi_fuel/fi_fuel_pure_item.png differ diff --git a/ressources/fission/fi_fuel/fi_fuel_used_advanced_item.png b/ressources/fission/fi_fuel/fi_fuel_used_advanced_item.png index 144bf06..f4a2b46 100644 Binary files a/ressources/fission/fi_fuel/fi_fuel_used_advanced_item.png and b/ressources/fission/fi_fuel/fi_fuel_used_advanced_item.png differ diff --git a/ressources/fission/fi_fuel/fi_fuel_used_advanced_thorium_item.png b/ressources/fission/fi_fuel/fi_fuel_used_advanced_thorium_item.png index 889d759..7cefd43 100644 Binary files a/ressources/fission/fi_fuel/fi_fuel_used_advanced_thorium_item.png and b/ressources/fission/fi_fuel/fi_fuel_used_advanced_thorium_item.png differ diff --git a/ressources/fission/fi_fuel/fi_fuel_used_basic_item.png b/ressources/fission/fi_fuel/fi_fuel_used_basic_item.png index f1bb32b..2ee5d90 100644 Binary files a/ressources/fission/fi_fuel/fi_fuel_used_basic_item.png and b/ressources/fission/fi_fuel/fi_fuel_used_basic_item.png differ diff --git a/ressources/fission/fi_fuel/fi_fuel_used_basic_thorium_item.png b/ressources/fission/fi_fuel/fi_fuel_used_basic_thorium_item.png index be1221f..f05bb67 100644 Binary files a/ressources/fission/fi_fuel/fi_fuel_used_basic_thorium_item.png and b/ressources/fission/fi_fuel/fi_fuel_used_basic_thorium_item.png differ diff --git a/ressources/fission/fi_fuel/fi_fuel_used_pure_item.png b/ressources/fission/fi_fuel/fi_fuel_used_pure_item.png index b804252..1d50a39 100644 Binary files a/ressources/fission/fi_fuel/fi_fuel_used_pure_item.png and b/ressources/fission/fi_fuel/fi_fuel_used_pure_item.png differ diff --git a/ressources/icons/overlay_1.png b/ressources/icons/overlay_1.png new file mode 100644 index 0000000..9f62606 Binary files /dev/null and b/ressources/icons/overlay_1.png differ diff --git a/ressources/icons/overlay_2.png b/ressources/icons/overlay_2.png new file mode 100644 index 0000000..90b5e9a Binary files /dev/null and b/ressources/icons/overlay_2.png differ diff --git a/ressources/icons/overlay_3.png b/ressources/icons/overlay_3.png new file mode 100644 index 0000000..a83d310 Binary files /dev/null and b/ressources/icons/overlay_3.png differ diff --git a/ressources/icons/overlay_4.png b/ressources/icons/overlay_4.png new file mode 100644 index 0000000..19afd8a Binary files /dev/null and b/ressources/icons/overlay_4.png differ diff --git a/ressources/icons/overlay_copper.png b/ressources/icons/overlay_copper.png new file mode 100644 index 0000000..9b0bd56 Binary files /dev/null and b/ressources/icons/overlay_copper.png differ diff --git a/ressources/icons/overlay_iron.png b/ressources/icons/overlay_iron.png new file mode 100644 index 0000000..8b406d3 Binary files /dev/null and b/ressources/icons/overlay_iron.png differ diff --git a/ressources/icons/overlay_stone.png b/ressources/icons/overlay_stone.png new file mode 100644 index 0000000..11c9068 Binary files /dev/null and b/ressources/icons/overlay_stone.png differ diff --git a/ressources/icons/overlay_uranium.png b/ressources/icons/overlay_uranium.png new file mode 100644 index 0000000..570a260 Binary files /dev/null and b/ressources/icons/overlay_uranium.png differ