diff --git a/changelog.txt b/changelog.txt index df52d64..b6dba76 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,10 +1,15 @@ --------------------------------------------------------------------------------------------------- Version: 1.0.28 -Date: ??.??.2022 +Date: 17.06.2022 Features: + - added ingot former machine (fusion stage) + - retextured rare metals + - added a compressed version of rich water Changes: - changed map color of silo tank to that of normal storage tank + - made electric furnace cheaper in terms of fiberglass r. plastic + - but increased titanium/neodymiumusage in science packs Bugfixes: - fixed issue with K2 and rfp in overhaul mode diff --git a/data.lua b/data.lua index c98cd5e..690c03c 100644 --- a/data.lua +++ b/data.lua @@ -62,6 +62,7 @@ require('prototypes/fusion/fu_magnet') require('prototypes/fusion/fu_miner') require('prototypes/fusion/fu_turbine') require('prototypes/fusion/fu_lab') +require('prototypes/fusion/fu_ingot') require('prototypes/gravitation/gr_crafter') require('prototypes/gravitation/gr_materials') diff --git a/locale/en/lang_en.cfg b/locale/en/lang_en.cfg index bb14ab5..9fae301 100644 --- a/locale/en/lang_en.cfg +++ b/locale/en/lang_en.cfg @@ -88,7 +88,8 @@ fi_materials_rich_powder=Rich powder fi_tech_fuel=Fission tech fi_test_fuel=Nuclear research fuel fi_test_used_fuel=Used research fuel - +fi_materials_rich_solution=Rich solution container +fi_materials_dirty_solution=Dirty water container fu_tech_sign_item=Fusion tech @@ -122,6 +123,11 @@ fu_materials_empty_container=Empty neutron container fu_materials_charged_container=Charged neutron container fu_materials_stone=Rock fragment fu_miner_fuel_item=Drill +fu_materials_slag=Slag +fu_materials_gold_ingot=Gold ingot +fu_materials_titan_ingot=Titanium ingot +fu_materials_neodym_ingot=Neodymium ingot +fu_materials_lead_ingot=Lead ingot gr_materials_fusion_cell_item=Compact fusion cell @@ -319,6 +325,7 @@ fu_magnet_item=This facility uses strong magnetic fields to gather data or make fu_plasma_item=This facility can create plasmas and gathers data about plasma confinement. Consumes a lot of power and needs [color=blue]coolant[/color][fluid=fu_lead_fluid_cold] to work. fu_boiler_item=Seperate water[fluid=water] using high temperatures. Consumes [color=red]heat[/color] and only works above [color=red]500dec[/color]. fu_exchanger_item=Turn [color=red]hot lead coolant (1500 dec)[/color][fluid=fu_lead_fluid_cold] into [color=blue]cold coolant (500 dec)[/color][fluid=fu_lead_fluid_cold]. Can be used to heat water[fluid=water] to steam[fluid=steam] with the trasnfer heat. +fu_ingot_item=This factory building can [color=red]smelt[/color] as any ordinary furnace and can be used to make [color=orange]ingots[/color] from liquid metals. Other then vanila furnaces this machines allows the selection of recipes. #overhaul uranium-fuel-cell-updated=This fuel cell can't be used in realistic reactor. @@ -340,6 +347,7 @@ fu_reactor_tech=Build a fusion reactor based on the stellarator design. This rea fu_tokamak_tech=This reactor is based on the tokamak design. It will fuse its fuel very quickly, meaning it can only be run in pulsing. fu_activator_tech=Collect thermal neutrons from nuclear fission reactions. Basic Isotopes will capture those neutrons and turn into more valuable isotopes. fu_star_engine_tech=A star engine is literally a little star. Using huge amounts of power this multi-unit machine can produce whatever basic element you want, in huge quantities. To make this dream come true you will need one core and at least one cooling/heating unit, a lot of space and energy. Place down the core and after that cooling and heating unit, facing towards the core. The core can run with only one unit of each at half speed. After building the machine you will need to research the tech for each element. +fu_ingot_tech=Build a ingot factory to smelt your ore and make ingots from 248ks rare metals to improve yield. gr_stage_tech=Using exotic matter you will be able to exceed limits of known technology. Even Fusion will be nothing compared to those infinite possibilities. @@ -427,6 +435,7 @@ gr_white_hole_entity=White hole generator gr_lab_entity=S-lab fu_lab_entity=T-lab +fu_ingot_entity=Ingot factory #equipment [equipment-name] @@ -582,6 +591,11 @@ fi_grenade_tech=Overcharged grenades fu_grenade_tech=Hypercharged grenades fu_lab_tech=T-lab +fu_ingot_tech=Advanced smelting mechanics +fu_lead_ingot_tech=Lead ingot refining +fu_titan_ingot_tech=Titan ingot refining +fu_gold_ingot_tech=Gold ingot refining +fu_neodym_ingot_tech=Neodymium ingot refining #effects [description] diff --git a/prototypes/248k_subgroups.lua b/prototypes/248k_subgroups.lua index 38f7f55..f28cfdc 100644 --- a/prototypes/248k_subgroups.lua +++ b/prototypes/248k_subgroups.lua @@ -473,6 +473,10 @@ data:extend({ name = 'fi_compound_machine_category', type = 'recipe-category', }, + { + name = 'fu_ingot_category', + type = 'recipe-category', + }, { name = 'fu_laser_category', type = 'recipe-category', diff --git a/prototypes/248k_techs.lua b/prototypes/248k_techs.lua index c94ba43..1e6ff26 100644 --- a/prototypes/248k_techs.lua +++ b/prototypes/248k_techs.lua @@ -1115,6 +1115,22 @@ data:extend({ type = 'unlock-recipe', recipe = 'fi_rich_powder_recipe', }, + { + type = 'unlock-recipe', + recipe = 'fi_rich_solution_pack_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fi_rich_solution_unpack_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fi_dirty_solution_pack_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fi_dirty_solution_unpack_recipe', + }, { type = 'unlock-recipe', recipe = 'fi_extract_rich_powder_recipe', @@ -1864,6 +1880,153 @@ data:extend({ time = 45, }, }, + { + name = 'fu_ingot_tech', + type = 'technology', + icon = sprite('fu_ingot_tech.png'), + icon_size = 128, + prerequisites = { + 'fu_TIM_tech', + 'fu_KFK_tech' + }, + effects = { + { + type = 'unlock-recipe', + recipe = 'fu_ingot_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fu_treat_slag_recipe', + }, + }, + unit = { + count = '200', + ingredients = { + {'chemical-science-pack',1}, + {'automation-science-pack',1}, + {'logistic-science-pack',1}, + {'utility-science-pack',1} + }, + time = 45, + }, + }, + { + name = 'fu_gold_ingot_tech', + type = 'technology', + icon = sprite('fu_gold_ingot_tech.png'), + icon_size = 128, + prerequisites = { + 'fu_ingot_tech', + }, + effects = { + { + type = 'unlock-recipe', + recipe = 'fu_gold_ingot_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fu_gold_plate_recipe', + }, + }, + unit = { + count = '200', + ingredients = { + {'chemical-science-pack',1}, + {'automation-science-pack',1}, + {'logistic-science-pack',1}, + {'utility-science-pack',1}, + }, + time = 45, + }, + }, + { + name = 'fu_neodym_ingot_tech', + type = 'technology', + icon = sprite('fu_neodym_ingot_tech.png'), + icon_size = 128, + prerequisites = { + 'fu_ingot_tech', + }, + effects = { + { + type = 'unlock-recipe', + recipe = 'fu_neodym_ingot_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fu_neodym_plate_recipe', + }, + }, + unit = { + count = '200', + ingredients = { + {'chemical-science-pack',1}, + {'automation-science-pack',1}, + {'logistic-science-pack',1}, + {'utility-science-pack',1}, + }, + time = 45, + }, + }, + { + name = 'fu_titan_ingot_tech', + type = 'technology', + icon = sprite('fu_titan_ingot_tech.png'), + icon_size = 128, + prerequisites = { + 'fu_ingot_tech', + }, + effects = { + { + type = 'unlock-recipe', + recipe = 'fu_titan_ingot_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fu_titan_plate_recipe', + }, + }, + unit = { + count = '200', + ingredients = { + {'chemical-science-pack',1}, + {'automation-science-pack',1}, + {'logistic-science-pack',1}, + {'utility-science-pack',1}, + }, + time = 45, + }, + }, + { + name = 'fu_lead_ingot_tech', + type = 'technology', + icon = sprite('fu_lead_ingot_tech.png'), + icon_size = 128, + prerequisites = { + 'fu_ingot_tech', + 'fu_lead_tech', + }, + effects = { + { + type = 'unlock-recipe', + recipe = 'fu_lead_ingot_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fu_lead_plate_recipe', + }, + }, + unit = { + count = '200', + ingredients = { + {'chemical-science-pack',1}, + {'automation-science-pack',1}, + {'logistic-science-pack',1}, + {'utility-science-pack',1}, + }, + time = 45, + }, + }, { name = 'fu_laser_tech', type = 'technology', diff --git a/prototypes/fi_recipes.lua b/prototypes/fi_recipes.lua index d604aae..894b49e 100644 --- a/prototypes/fi_recipes.lua +++ b/prototypes/fi_recipes.lua @@ -1535,4 +1535,94 @@ data:extend({ subgroup = 'fluid-recipes', order = 'b[fluid-chemistry]-e[solid-fuel-from-heavy-oil]-d', }, + { + name = 'fi_rocket_fuel_1_recipe', + type = 'recipe', + enabled = 'false', + category = 'chemistry', + main_product = 'rocket-fuel', + icon = sprite('icons/fi_rocket_2.png'), + icon_size = 64, + ingredients = { + {type="fluid", name="el_kerosene", amount=20}, + {type="item", name="solid-fuel", amount=10}, + }, + results = { + {type="item", name="rocket-fuel", amount=1}, + }, + result_count = 1, + energy_required = 30, + subgroup = 'fluid-recipes', + order = 'b[fluid-chemistry]-e[solid-fuel-from-heavy-oil]-d', + }, + { + name = 'fi_rich_solution_pack_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting-with-fluid', + main_product = 'fi_materials_rich_solution', + ingredients = { + {type="item", name="fi_materials_empty_solution", amount=1}, + {type="fluid", name="fi_dirty_water", amount=1000}, + }, + results = { + {type="item", name="fi_materials_rich_solution", amount=1}, + }, + result_count = 1, + energy_required = 0.2, + always_show_made_in = true, + }, + { + name = 'fi_rich_solution_unpack_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting-with-fluid', + main_product = 'fi_dirty_water', + ingredients = { + {type="item", name="fi_materials_rich_solution", amount=1}, + }, + results = { + {type="fluid", name="fi_dirty_water", amount=1000}, + {type="item", name="fi_materials_empty_solution", amount=1}, + }, + result_count = 1, + energy_required = 0.2, + always_show_made_in = true, + }, + { + name = 'fi_dirty_solution_pack_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting-with-fluid', + main_product = 'fi_materials_dirty_solution', + ingredients = { + {type="item", name="fi_materials_empty_solution", amount=1}, + {type="fluid", name="el_dirty_water", amount=1000}, + }, + results = { + {type="item", name="fi_materials_dirty_solution", amount=1}, + }, + result_count = 1, + energy_required = 0.2, + always_show_made_in = true, + }, + { + name = 'fi_dirty_solution_unpack_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting-with-fluid', + main_product = 'el_dirty_water', + ingredients = { + {type="item", name="fi_materials_dirty_solution", amount=1}, + }, + results = { + {type="fluid", name="el_dirty_water", amount=1000}, + {type="item", name="fi_materials_dirty_solution", amount=1}, + }, + result_count = 1, + energy_required = 0.2, + always_show_made_in = true, + subgroup = 'fi_item_subgroup_f', + order = 'f-a', + }, }) \ No newline at end of file diff --git a/prototypes/fission/fi_materials.lua b/prototypes/fission/fi_materials.lua index aac4337..a03ec77 100644 --- a/prototypes/fission/fi_materials.lua +++ b/prototypes/fission/fi_materials.lua @@ -180,5 +180,23 @@ data:extend({ subgroup = 'fi_item_subgroup_a-b', order = 'b-a', }, + { + name = 'fi_materials_rich_solution', + type = 'item', + icon = sprite('rich_solution.png'), + icon_size = 64, + stack_size = 100, + subgroup = 'fi_item_subgroup_b', + order = 'f-b', + }, + { + name = 'fi_materials_dirty_solution', + type = 'item', + icon = sprite('dirty_solution.png'), + icon_size = 64, + stack_size = 100, + subgroup = 'fi_item_subgroup_b', + order = 'f-b', + }, }) diff --git a/prototypes/fission/fi_modules.lua b/prototypes/fission/fi_modules.lua index 29f0140..e250620 100644 --- a/prototypes/fission/fi_modules.lua +++ b/prototypes/fission/fi_modules.lua @@ -52,7 +52,16 @@ local limitation_list = { 'fi_refinery_sulfur_recipe', 'fi_refinery_kerosene_coal_recipe', 'fi_refinery_kerosene_recipe', - 'fi_empty_solution_recipe' + 'fi_empty_solution_recipe', + 'fu_gold_ingot_recipe', + 'fu_titan_ingot_recipe', + 'fu_neodym_ingot_recipe', + 'fu_lead_ingot_recipe', + 'fu_gold_plate_recipe', + 'fu_titan_plate_recipe', + 'fu_neodym_plate_recipe', + 'fu_lead_plate_recipe', + } --item diff --git a/prototypes/fu_recipes.lua b/prototypes/fu_recipes.lua index 85d52b0..2b0331b 100644 --- a/prototypes/fu_recipes.lua +++ b/prototypes/fu_recipes.lua @@ -1911,4 +1911,200 @@ data:extend({ result_count = 1, energy_required = 10, }, + { + name = 'fu_ingot_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting', + main_product = 'fu_ingot_item', + ingredients = { + {'concrete',50}, + {'fu_materials_TIM',40}, + {'fu_materials_KFK',40}, + {'fi_materials_GFK',40}, + {'iron-gear-wheel',20}, + {'electric-furnace',2}, + }, + results = { + {type="item", name="fu_ingot_item", amount=1}, + }, + result_count = 1, + energy_required = 5, + }, + { + name = 'fu_gold_ingot_recipe', + type = 'recipe', + enabled = 'false', + category = 'fu_ingot_category', + main_product = 'fu_materials_gold_ingot', + ingredients = { + {type="fluid", name="fi_arc_gold", amount=175}, + }, + results = { + {type="item", name="fu_materials_gold_ingot", amount=1}, + {type="item", name="fu_materials_slag", amount=1, probability=0.25}, + }, + result_count = 1, + energy_required = 0.2*6, + subgroup = 'fu_item_subgroup_a', + order = 'a-a-a', + always_show_made_in = true, + }, + { + name = 'fu_gold_plate_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting', + main_product = 'fi_materials_gold', + ingredients = { + {type="item", name="fu_materials_gold_ingot", amount=1}, + }, + results = { + {type="item", name="fi_materials_gold", amount=2}, + }, + result_count = 1, + energy_required = 0.2, + subgroup = 'fu_item_subgroup_a', + order = 'a-a-b', + always_show_made_in = true, + }, + { + name = 'fu_neodym_ingot_recipe', + type = 'recipe', + enabled = 'false', + category = 'fu_ingot_category', + main_product = 'fu_materials_neodym_ingot', + ingredients = { + {type="fluid", name="fi_arc_neodym", amount=175}, + }, + results = { + {type="item", name="fu_materials_neodym_ingot", amount=1}, + {type="item", name="fu_materials_slag", amount=1, probability=0.25}, + }, + result_count = 1, + energy_required = 0.2*6, + subgroup = 'fu_item_subgroup_a', + order = 'a-a-a', + always_show_made_in = true, + }, + { + name = 'fu_neodym_plate_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting', + main_product = 'fi_materials_neodym', + ingredients = { + {type="item", name="fu_materials_neodym_ingot", amount=1}, + }, + results = { + {type="item", name="fi_materials_neodym", amount=2}, + }, + result_count = 1, + energy_required = 0.2, + subgroup = 'fu_item_subgroup_a', + order = 'a-a-b', + always_show_made_in = true, + }, + { + name = 'fu_titan_ingot_recipe', + type = 'recipe', + enabled = 'false', + category = 'fu_ingot_category', + main_product = 'fu_materials_titan_ingot', + ingredients = { + {type="fluid", name="fi_arc_titan", amount=175}, + }, + results = { + {type="item", name="fu_materials_titan_ingot", amount=1}, + {type="item", name="fu_materials_slag", amount=1, probability=0.25}, + }, + result_count = 1, + energy_required = 0.2*6, + subgroup = 'fu_item_subgroup_a', + order = 'a-a-a', + always_show_made_in = true, + }, + { + name = 'fu_titan_plate_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting', + main_product = 'fi_materials_titan', + ingredients = { + {type="item", name="fu_materials_titan_ingot", amount=1}, + }, + results = { + {type="item", name="fi_materials_titan", amount=2}, + }, + result_count = 1, + energy_required = 0.2, + subgroup = 'fu_item_subgroup_a', + order = 'a-a-b', + always_show_made_in = true, + }, + { + name = 'fu_lead_ingot_recipe', + type = 'recipe', + enabled = 'false', + category = 'fu_ingot_category', + main_product = 'fu_materials_lead_ingot', + ingredients = { + {type="fluid", name="fu_arc_pure_lead", amount=175}, + }, + results = { + {type="item", name="fu_materials_lead_ingot", amount=1}, + {type="item", name="fu_materials_slag", amount=1, probability=0.25}, + }, + result_count = 1, + energy_required = 0.2*6, + subgroup = 'fu_item_subgroup_a', + order = 'a-a-a', + always_show_made_in = true, + }, + { + name = 'fu_lead_plate_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting', + main_product = 'fu_lead_item', + ingredients = { + {type="item", name="fu_materials_lead_ingot", amount=1}, + }, + results = { + {type="item", name="fu_lead_item", amount=2}, + }, + result_count = 1, + energy_required = 0.2, + subgroup = 'fu_item_subgroup_a', + order = 'a-a-b', + always_show_made_in = true, + }, + { + name = 'fu_treat_slag_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting-with-fluid', + main_product = 'el_dirty_water', + ingredients = { + {type="item", name="fu_materials_slag", amount=10}, + {type="fluid", name="water", amount=25}, + }, + results = { + {type="fluid", name="el_dirty_water", amount=25}, + }, + result_count = 1, + energy_required = 0.2, + always_show_made_in = true, + subgroup = 'fu_item_subgroup_f', + order = 'f', + icon_size = 64, + icons = { + { + icon = "__248k__/ressources/fluids/el_dirty_water.png" + }, + { + icon = "__248k__/ressources/icons/overlay_slag.png" + } + }, + }, }) \ No newline at end of file diff --git a/prototypes/fusion/fu_ingot.lua b/prototypes/fusion/fu_ingot.lua new file mode 100644 index 0000000..6481ff4 --- /dev/null +++ b/prototypes/fusion/fu_ingot.lua @@ -0,0 +1,174 @@ +--local functions +local function config(name) + return settings.startup['fu_ingot_'..name].value +end + +local function sprite(name) + return '__248k__/ressources/fusion/fu_ingot/fu_ingot_'..name +end + +--item +data:extend({ + { + name = 'fu_ingot_item', + type = 'item', + icon = sprite('icon.png'), + icon_size = 64, + place_result = 'fu_ingot_entity', + stack_size = 20, + subgroup = 'fu_item_subgroup_c', + order = 'a-b', + }, + +}) + +--entity +data:extend({ + --prototype + { + name = 'fu_ingot_entity', + type = 'assembling-machine', + icon = sprite('icon.png'), + icon_size = 64, + flags = {"player-creation","placeable-neutral"}, + max_health = 300, + corpse = 'big-remnants', + collision_box = {{-3.4,-3.4},{3.4,3.4}}, + selection_box = {{-3.5,-3.5},{3.5,3.5}}, + map_color = {r=0, g=0, b=1, a=1}, + minable = { + mining_time = 1, + result = 'fu_ingot_item', + }, + crafting_categories = {'fu_ingot_category', 'smelting'}, + crafting_speed = 6, + ingredient_count = 2, + --fixed_recipe = 'el_water_pressure_recipe', + energy_source = { + type = 'electric', + usage_priority = 'secondary-input', + }, + energy_usage = '2MW', + allowed_effects = {"speed", "consumption", "pollution", "productivity"}, + module_specification = { + module_info_icon_shift = { + 0, + 0.8 + }, + module_slots = 2 + }, + fluid_boxes = { + { + + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {type = "input", position = {0, -4}}, + }, + production_type = "input" + }, + { + + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {type = "input", position = {-4, 0}} + }, + production_type = "input" + }, + { + + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {type = "input", position = {4, 0}}, + --{type = "output", position = {2, -2.5}} + }, + production_type = "input" + }, + { + + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {type = "input", position = {0, 4}}, + }, + production_type = "input" + }, + }, + --animation + animation = { + filename = sprite('entity_base.png'), + size = {512,512}, + scale = 0.54, + line_length = 1, + --lines_per_file = 2, + frame_count = 1, + --animation_speed = 0.2, + shift = {0,-0.3} + }, + working_visualisations = { + { + animation = + { + filename = sprite('entity_animation.png'), + size = {512,512}, + scale = 0.54, + line_length = 2, + lines_per_file = 2, + frame_count = 4, + animation_speed = 0.2, + shift = {0,-0.3} + }, + light = { + type = "basic", + intensity = 1, + size = 15, + color = {r=0.79 ,g=0.08 ,b=0.87 }, + } + } + }, + working_sound = + { + sound = {filename = "__base__/sound/electric-furnace.ogg" }, + apparent_volume = 0.3, + }, + }, +}) + +--{ +-- production_type = "input", + --pipe_picture = assembler2pipepictures(), + --pipe_covers = pipecoverspictures(), +-- base_area = 10, +-- base_level = -1, +-- pipe_connections = { +-- { type="input", position = {-2, -2,5} }, +-- { type="input", position = {2, -2.5} }, +-- }, +-- }, +-- { +-- production_type = "output", + --pipe_picture = assembler2pipepictures(), + --pipe_covers = pipecoverspictures(), +-- base_area = 10, +-- base_level = 1, +-- pipe_connections = {{ type="output", position = {2, 2.5} }}, +-- }, +-- off_when_no_fluid_recipe = true \ No newline at end of file diff --git a/prototypes/fusion/fu_materials.lua b/prototypes/fusion/fu_materials.lua index 07c85ab..a568e55 100644 --- a/prototypes/fusion/fu_materials.lua +++ b/prototypes/fusion/fu_materials.lua @@ -157,4 +157,49 @@ data:extend({ subgroup = 'fi_item_subgroup_a', order = 'f-a', }, + { + name = 'fu_materials_gold_ingot', + type = 'item', + icon = sprite('gold_ingot.png'), + icon_size = 64, + stack_size = 100, + subgroup = 'fu_item_subgroup_a', + order = 'a-a', + }, + { + name = 'fu_materials_titan_ingot', + type = 'item', + icon = sprite('titan_ingot.png'), + icon_size = 64, + stack_size = 100, + subgroup = 'fu_item_subgroup_a', + order = 'a-a', + }, + { + name = 'fu_materials_neodym_ingot', + type = 'item', + icon = sprite('neodym_ingot.png'), + icon_size = 64, + stack_size = 100, + subgroup = 'fu_item_subgroup_a', + order = 'a-a', + }, + { + name = 'fu_materials_lead_ingot', + type = 'item', + icon = sprite('lead_ingot.png'), + icon_size = 64, + stack_size = 100, + subgroup = 'fu_item_subgroup_a', + order = 'a-a', + }, + { + name = 'fu_materials_slag', + type = 'item', + icon = sprite('slag.png'), + icon_size = 64, + stack_size = 100, + subgroup = 'fu_item_subgroup_a', + order = 'f-a', + }, }) diff --git a/ressources/fission/fi_materials/fi_materials_dirty_solution.png b/ressources/fission/fi_materials/fi_materials_dirty_solution.png new file mode 100644 index 0000000..85ec066 Binary files /dev/null and b/ressources/fission/fi_materials/fi_materials_dirty_solution.png differ diff --git a/ressources/fission/fi_materials/fi_materials_gold.png b/ressources/fission/fi_materials/fi_materials_gold.png index a502c31..75ddece 100644 Binary files a/ressources/fission/fi_materials/fi_materials_gold.png and b/ressources/fission/fi_materials/fi_materials_gold.png differ diff --git a/ressources/fission/fi_materials/fi_materials_neodym.png b/ressources/fission/fi_materials/fi_materials_neodym.png index 926d93e..733bf4b 100644 Binary files a/ressources/fission/fi_materials/fi_materials_neodym.png and b/ressources/fission/fi_materials/fi_materials_neodym.png differ diff --git a/ressources/fission/fi_materials/fi_materials_rich_solution.png b/ressources/fission/fi_materials/fi_materials_rich_solution.png new file mode 100644 index 0000000..47dbd66 Binary files /dev/null and b/ressources/fission/fi_materials/fi_materials_rich_solution.png differ diff --git a/ressources/fission/fi_materials/fi_materials_titan.png b/ressources/fission/fi_materials/fi_materials_titan.png index 526889e..f6b4e33 100644 Binary files a/ressources/fission/fi_materials/fi_materials_titan.png and b/ressources/fission/fi_materials/fi_materials_titan.png differ diff --git a/ressources/fusion/fu_ingot/fu_ingot_entity_animation.png b/ressources/fusion/fu_ingot/fu_ingot_entity_animation.png new file mode 100644 index 0000000..bb8289e Binary files /dev/null and b/ressources/fusion/fu_ingot/fu_ingot_entity_animation.png differ diff --git a/ressources/fusion/fu_ingot/fu_ingot_entity_base.png b/ressources/fusion/fu_ingot/fu_ingot_entity_base.png new file mode 100644 index 0000000..00e4bbc Binary files /dev/null and b/ressources/fusion/fu_ingot/fu_ingot_entity_base.png differ diff --git a/ressources/fusion/fu_ingot/fu_ingot_icon.png b/ressources/fusion/fu_ingot/fu_ingot_icon.png new file mode 100644 index 0000000..9fe9379 Binary files /dev/null and b/ressources/fusion/fu_ingot/fu_ingot_icon.png differ diff --git a/ressources/fusion/fu_lead/fu_lead_item.png b/ressources/fusion/fu_lead/fu_lead_item.png index f770b2c..bd960fd 100644 Binary files a/ressources/fusion/fu_lead/fu_lead_item.png and b/ressources/fusion/fu_lead/fu_lead_item.png differ diff --git a/ressources/fusion/fu_materials/fu_materials_gold_ingot.png b/ressources/fusion/fu_materials/fu_materials_gold_ingot.png new file mode 100644 index 0000000..bb5a427 Binary files /dev/null and b/ressources/fusion/fu_materials/fu_materials_gold_ingot.png differ diff --git a/ressources/fusion/fu_materials/fu_materials_lead_ingot.png b/ressources/fusion/fu_materials/fu_materials_lead_ingot.png new file mode 100644 index 0000000..51d7cf6 Binary files /dev/null and b/ressources/fusion/fu_materials/fu_materials_lead_ingot.png differ diff --git a/ressources/fusion/fu_materials/fu_materials_neodym_ingot.png b/ressources/fusion/fu_materials/fu_materials_neodym_ingot.png new file mode 100644 index 0000000..d206108 Binary files /dev/null and b/ressources/fusion/fu_materials/fu_materials_neodym_ingot.png differ diff --git a/ressources/fusion/fu_materials/fu_materials_slag.png b/ressources/fusion/fu_materials/fu_materials_slag.png new file mode 100644 index 0000000..55c4d4c Binary files /dev/null and b/ressources/fusion/fu_materials/fu_materials_slag.png differ diff --git a/ressources/fusion/fu_materials/fu_materials_titan_ingot.png b/ressources/fusion/fu_materials/fu_materials_titan_ingot.png new file mode 100644 index 0000000..83f0d41 Binary files /dev/null and b/ressources/fusion/fu_materials/fu_materials_titan_ingot.png differ diff --git a/ressources/icons/overlay_slag.png b/ressources/icons/overlay_slag.png new file mode 100644 index 0000000..b14c4b7 Binary files /dev/null and b/ressources/icons/overlay_slag.png differ diff --git a/ressources/techs/fu_gold_ingot_tech.png b/ressources/techs/fu_gold_ingot_tech.png new file mode 100644 index 0000000..6daf40d Binary files /dev/null and b/ressources/techs/fu_gold_ingot_tech.png differ diff --git a/ressources/techs/fu_ingot_tech.png b/ressources/techs/fu_ingot_tech.png new file mode 100644 index 0000000..07f47a6 Binary files /dev/null and b/ressources/techs/fu_ingot_tech.png differ diff --git a/ressources/techs/fu_lead_ingot_tech.png b/ressources/techs/fu_lead_ingot_tech.png new file mode 100644 index 0000000..08390a9 Binary files /dev/null and b/ressources/techs/fu_lead_ingot_tech.png differ diff --git a/ressources/techs/fu_neodym_ingot_tech.png b/ressources/techs/fu_neodym_ingot_tech.png new file mode 100644 index 0000000..74eee33 Binary files /dev/null and b/ressources/techs/fu_neodym_ingot_tech.png differ diff --git a/ressources/techs/fu_titan_ingot_tech.png b/ressources/techs/fu_titan_ingot_tech.png new file mode 100644 index 0000000..d1eade2 Binary files /dev/null and b/ressources/techs/fu_titan_ingot_tech.png differ diff --git a/scripts/overhaul.lua b/scripts/overhaul.lua index 175662c..942f5dd 100644 --- a/scripts/overhaul.lua +++ b/scripts/overhaul.lua @@ -81,7 +81,7 @@ building_table = { {"express-splitter", "fi_materials_GFK", 3}, {"express-transport-belt", "fi_materials_GFK", 1}, {"express-underground-belt","fi_materials_GFK", 8}, - {"electric-furnace", "fi_materials_GFK", 8}, + {"electric-furnace", "fi_materials_GFK", 4}, {"centrifuge", "fi_materials_GFK", 20}, {"steam-turbine", "fi_materials_GFK", 15}, {"heat-exchanger", "fi_materials_GFK", 10}, @@ -112,8 +112,8 @@ item_table = { --{"automation-science-pack", "fi_modules_core_item", 3}, --{"logistic-science-pack", "fi_modules_core_item", 3}, {"chemical-science-pack", "el_energy_crystal_item",2}, - {"production-science-pack", "fi_materials_titan", 1}, - {"utility-science-pack", "fi_materials_neodym", 1}, + {"production-science-pack", "fi_materials_titan", 3}, + {"utility-science-pack", "fi_materials_neodym", 3}, }