diff --git a/changelog.txt b/changelog.txt index 7cb7ee9..ce6b352 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,14 @@ --------------------------------------------------------------------------------------------------- +Version: 1.0.22 +Date: 19.5.2022 + Features: + - added a new sprite for hot lead coolant + + Changes: + - added module slots for laser/plasma/magnet facility, decreased their lead usage + - added module slots to fusor, improves yield of fusor recipes + - increased yield of lithium to lithium[6] +--------------------------------------------------------------------------------------------------- Version: 1.0.21 Date: 13.5.2022 Features: diff --git a/info.json b/info.json index 1954d99..6faa76a 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "248k", - "version": "1.0.21", + "version": "1.0.22", "title": "248k Mod", "author": "PreLeyZero", "factorio_version": "1.1", diff --git a/prototypes/248k_fluids.lua b/prototypes/248k_fluids.lua index f07b697..e6509ea 100644 --- a/prototypes/248k_fluids.lua +++ b/prototypes/248k_fluids.lua @@ -178,7 +178,7 @@ data:extend({ { name = 'fu_lead_fluid_hot', type = 'fluid', - icon = sprite('fu_lead_fluid.png'), + icon = sprite('fu_lead_fluid_hot.png'), icon_size = 64, default_temperature = 15, max_temperature = 1500, diff --git a/prototypes/fu_recipes.lua b/prototypes/fu_recipes.lua index d155c27..0fecd1d 100644 --- a/prototypes/fu_recipes.lua +++ b/prototypes/fu_recipes.lua @@ -99,7 +99,7 @@ data:extend({ {type="fluid", name="fu_protium", amount=100}, }, result = 'fu_materials_fusion_card', - result_count = 5, + result_count = 10, energy_required = 100, always_show_made_in = true, }, @@ -113,7 +113,7 @@ data:extend({ {type="fluid", name="fu_deuterium", amount=100}, }, result = 'fu_materials_fusion_card', - result_count = 30, + result_count = 100, energy_required = 100, always_show_made_in = true, }, @@ -127,7 +127,7 @@ data:extend({ {type="fluid", name="fu_tritium", amount=100}, }, result = 'fu_materials_fusion_card', - result_count = 100, + result_count = 500, energy_required = 100, always_show_made_in = true, }, @@ -140,7 +140,7 @@ data:extend({ {type="fluid", name="fu_deuterium", amount=100}, }, result = 'fu_materials_fusion_card', - result_count = 40, + result_count = 50, energy_required = 100, always_show_made_in = true, }, @@ -251,7 +251,7 @@ data:extend({ {type="item", name="fi_crushed_lithium_item", amount=1}, }, results = { - {type="fluid", name="fu_lithium_6", amount=1}, + {type="fluid", name="fu_lithium_6", amount=5}, }, result_count = 1, energy_required = 1, @@ -305,7 +305,7 @@ data:extend({ category = 'crafting-with-fluid', enabled = 'false', ingredients = { - {type="item", name="fu_crushed_lead_item", amount=10}, + {type="item", name="fu_crushed_lead_item", amount=5}, }, results = { {type="fluid", name="fu_lead_fluid_cold", amount=100}, @@ -1189,12 +1189,12 @@ data:extend({ main_product = 'fu_materials_energy_crystal', subgroup = 'fu_item_subgroup_a-b', ingredients = { - {type="fluid", name="fu_lead_fluid_cold", amount=50}, + {type="fluid", name="fu_lead_fluid_cold", amount=10}, {type="item", name="fu_materials_refined_crystal", amount=1} }, results = { {type="item", name="fu_materials_energy_crystal", amount=1}, - {type="fluid", name="fu_lead_fluid_hot", amount=50} + {type="fluid", name="fu_lead_fluid_hot", amount=10} }, result_count = 1, energy_required = 3, @@ -1343,10 +1343,10 @@ data:extend({ category = 'fu_laser_category', main_product = 'fu_materials_laser_card', ingredients = { - {type="fluid", name="fu_lead_fluid_cold", amount=50} + {type="fluid", name="fu_lead_fluid_cold", amount=10} }, results = { - {type="fluid", name="fu_lead_fluid_hot", amount=50}, + {type="fluid", name="fu_lead_fluid_hot", amount=10}, {type="item", name="fu_materials_laser_card", amount=1} }, energy_required = 1, @@ -1359,11 +1359,11 @@ data:extend({ category = 'fu_plasma_category', main_product = 'fu_materials_plasma_card', ingredients = { - {type="fluid", name="fu_lead_fluid_cold", amount=50}, + {type="fluid", name="fu_lead_fluid_cold", amount=10}, {type="item", name="stone", amount=10} }, results = { - {type="fluid", name="fu_lead_fluid_hot", amount=50}, + {type="fluid", name="fu_lead_fluid_hot", amount=10}, {type="item", name="fu_materials_plasma_card", amount=1} }, energy_required = 1, @@ -1376,11 +1376,11 @@ data:extend({ category = 'fu_magnet_category', main_product = 'fu_materials_magnet_card', ingredients = { - {type="fluid", name="fu_lead_fluid_cold", amount=50}, + {type="fluid", name="fu_lead_fluid_cold", amount=10}, {type="item", name="fi_materials_neodym", amount=1} }, results = { - {type="fluid", name="fu_lead_fluid_hot", amount=50}, + {type="fluid", name="fu_lead_fluid_hot", amount=10}, {type="item", name="fu_materials_magnet_card", amount=1} }, energy_required = 1, diff --git a/prototypes/fusion/fu_fusor.lua b/prototypes/fusion/fu_fusor.lua index 1bda9ea..a71f82d 100644 --- a/prototypes/fusion/fu_fusor.lua +++ b/prototypes/fusion/fu_fusor.lua @@ -63,7 +63,7 @@ data:extend({ 0, 0.8 }, - module_slots = 2 + module_slots = 6 }, --fluid fluid_boxes = { diff --git a/prototypes/fusion/fu_laser.lua b/prototypes/fusion/fu_laser.lua index b5d8a23..99b12ce 100644 --- a/prototypes/fusion/fu_laser.lua +++ b/prototypes/fusion/fu_laser.lua @@ -48,6 +48,14 @@ data:extend({ type = 'electric', usage_priority = 'secondary-input', }, + allowed_effects = {"speed", "consumption", "pollution"}, + module_specification = { + module_info_icon_shift = { + 0, + 0.8 + }, + module_slots = 6 + }, energy_usage = '60MW', fluid_boxes = { { diff --git a/prototypes/fusion/fu_magnet.lua b/prototypes/fusion/fu_magnet.lua index d4298e0..b7187a1 100644 --- a/prototypes/fusion/fu_magnet.lua +++ b/prototypes/fusion/fu_magnet.lua @@ -49,6 +49,14 @@ data:extend({ usage_priority = 'secondary-input', }, energy_usage = '60MW', + allowed_effects = {"speed", "consumption", "pollution"}, + module_specification = { + module_info_icon_shift = { + 0, + 0.8 + }, + module_slots = 6 + }, fluid_boxes = { { diff --git a/prototypes/fusion/fu_plasma.lua b/prototypes/fusion/fu_plasma.lua index 495dfb7..7474dd9 100644 --- a/prototypes/fusion/fu_plasma.lua +++ b/prototypes/fusion/fu_plasma.lua @@ -49,6 +49,14 @@ data:extend({ usage_priority = 'secondary-input', }, energy_usage = '60MW', + allowed_effects = {"speed", "consumption", "pollution"}, + module_specification = { + module_info_icon_shift = { + 0, + 0.8 + }, + module_slots = 6 + }, fluid_boxes = { { diff --git a/prototypes/gr_recipes.lua b/prototypes/gr_recipes.lua index ccc7cc1..fdab89d 100644 --- a/prototypes/gr_recipes.lua +++ b/prototypes/gr_recipes.lua @@ -758,12 +758,12 @@ data:extend({ category = 'fu_magnet_category', main_product = 'gr_materials_magnet', ingredients = { - {type="fluid", name="fu_lead_fluid_cold", amount=50}, + {type="fluid", name="fu_lead_fluid_cold", amount=10}, {type="item", name="gr_materials_plasma_cube", amount=2}, {type="item", name="fu_materials_magnet", amount=1}, }, results = { - {type="fluid", name="fu_lead_fluid_hot", amount=50}, + {type="fluid", name="fu_lead_fluid_hot", amount=10}, {type="item", name="gr_materials_magnet", amount=1}, }, energy_required = 2, @@ -777,12 +777,12 @@ data:extend({ category = 'fu_plasma_category', main_product = 'gr_materials_plasma_cube', ingredients = { - {type="fluid", name="fu_lead_fluid_cold", amount=50}, + {type="fluid", name="fu_lead_fluid_cold", amount=10}, {type="item", name="fu_materials_KFK", amount=2}, {type="item", name="fi_materials_gold", amount=1}, }, results = { - {type="fluid", name="fu_lead_fluid_hot", amount=50}, + {type="fluid", name="fu_lead_fluid_hot", amount=10}, {type="item", name="gr_materials_plasma_cube", amount=1}, }, energy_required = 2, diff --git a/ressources/fluids/fu_lead_fluid_hot.png b/ressources/fluids/fu_lead_fluid_hot.png new file mode 100644 index 0000000..9e01364 Binary files /dev/null and b/ressources/fluids/fu_lead_fluid_hot.png differ