diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3b67d20 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +makefile +*.ps1 \ No newline at end of file diff --git a/data.lua b/data.lua index 35025ba..f5fa5dc 100644 --- a/data.lua +++ b/data.lua @@ -17,6 +17,12 @@ require('prototypes/electronic/el_train_fuel') require('prototypes/electronic/el_train_equipment') require('prototypes/electronic/el_energy_crystal') +require('prototypes/electronic/el_arc_furnace') +require('prototypes/electronic/el_caster') +require('prototypes/electronic/el_purifier') +require('prototypes/electronic/el_grower') +require('prototypes/electronic/el_materials') + require('prototypes/fission/fi_crafter') require('prototypes/fission/fi_miner') require('prototypes/fission/fi_fuel') @@ -30,6 +36,9 @@ require('prototypes/fission/fi_energy_crystal') require('prototypes/fission/fi_robo') require('prototypes/fission/fi_modules') +require('prototypes/fission/fi_fiberer') +require('prototypes/fission/fi_compound_machine') + require('prototypes/fusion/fu_fusor') require('prototypes/fusion/fu_boiler') require('prototypes/fusion/fu_burner') @@ -46,6 +55,11 @@ require('prototypes/fusion/fu_star_engine/fu_star_engine_heater') require('prototypes/fusion/fu_star_engine/fu_star_engine_heater_left') require('prototypes/fusion/fu_space_probe') +require('prototypes/fusion/fu_laser') +require('prototypes/fusion/fu_plasma') +require('prototypes/fusion/fu_materials') +require('prototypes/fusion/fu_magnet') + require('prototypes/gravitation/gr_crafter') require('prototypes/gravitation/gr_materials') require('prototypes/gravitation/gr_train') diff --git a/prototypes/248k_fluids.lua b/prototypes/248k_fluids.lua index 034f47d..3559471 100644 --- a/prototypes/248k_fluids.lua +++ b/prototypes/248k_fluids.lua @@ -158,4 +158,184 @@ data:extend({ subgroup = 'fu_item_subgroup_e', order = 'a-a', }, + { + name = 'el_dirty_water', + type = 'fluid', + icon = sprite('el_dirty_water.png'), + icon_size = 64, + default_temperature = 15, + max_temperature = 1500, + heat_capacity = '100kJ', + base_color = { r=0.36, g=0.36, b=0.6 }, + flow_color = { r=0.26, g=0.26, b=0.75 }, + pressure_to_speed_ratio = 0.400, + flow_to_energy_ratio = 0, + subgroup = 'el_item_subgroup_e', + order = 'a-a', + }, + { + name = 'el_arc_pure_iron', + type = 'fluid', + icon = sprite('el_arc_pure_iron.png'), + icon_size = 64, + default_temperature = 15, + max_temperature = 1500, + heat_capacity = '100kJ', + base_color = { r=0.92, g=0.29, b=0.22 }, + flow_color = { r=0.92, g=0.29, b=0.22 }, + pressure_to_speed_ratio = 0.400, + flow_to_energy_ratio = 0, + subgroup = 'el_item_subgroup_e', + order = 'a-a', + }, + { + name = 'el_arc_pure_copper', + type = 'fluid', + icon = sprite('el_arc_pure_copper.png'), + icon_size = 64, + default_temperature = 15, + max_temperature = 1500, + heat_capacity = '100kJ', + base_color = { r=0.92, g=0.29, b=0.22 }, + flow_color = { r=0.92, g=0.29, b=0.22 }, + pressure_to_speed_ratio = 0.400, + flow_to_energy_ratio = 0, + subgroup = 'el_item_subgroup_e', + order = 'a-a', + }, + { + name = 'el_arc_pure_aluminum', + type = 'fluid', + icon = sprite('el_arc_pure_aluminum.png'), + icon_size = 64, + default_temperature = 15, + max_temperature = 1500, + heat_capacity = '100kJ', + base_color = { r=0.92, g=0.29, b=0.22 }, + flow_color = { r=0.92, g=0.29, b=0.22 }, + pressure_to_speed_ratio = 0.400, + flow_to_energy_ratio = 0, + subgroup = 'el_item_subgroup_e', + order = 'a-a', + }, + { + name = 'fi_arc_glass', + type = 'fluid', + icon = sprite('fi_arc_glass.png'), + icon_size = 64, + default_temperature = 15, + max_temperature = 1500, + heat_capacity = '100kJ', + base_color = { r=0.92, g=0.29, b=0.22 }, + flow_color = { r=0.92, g=0.29, b=0.22 }, + pressure_to_speed_ratio = 0.400, + flow_to_energy_ratio = 0, + subgroup = 'fi_item_subgroup_f', + order = 'a-a', + }, + { + name = 'fi_arc_gold', + type = 'fluid', + icon = sprite('fi_arc_gold.png'), + icon_size = 64, + default_temperature = 15, + max_temperature = 1500, + heat_capacity = '100kJ', + base_color = { r=0.92, g=0.29, b=0.22 }, + flow_color = { r=0.92, g=0.29, b=0.22 }, + pressure_to_speed_ratio = 0.400, + flow_to_energy_ratio = 0, + subgroup = 'fi_item_subgroup_f', + order = 'a-a', + }, + { + name = 'fi_arc_titan', + type = 'fluid', + icon = sprite('fi_arc_titan.png'), + icon_size = 64, + default_temperature = 15, + max_temperature = 1500, + heat_capacity = '100kJ', + base_color = { r=0.92, g=0.29, b=0.22 }, + flow_color = { r=0.92, g=0.29, b=0.22 }, + pressure_to_speed_ratio = 0.400, + flow_to_energy_ratio = 0, + subgroup = 'fi_item_subgroup_f', + order = 'a-a', + }, + { + name = 'fi_arc_neodym', + type = 'fluid', + icon = sprite('fi_arc_neodym.png'), + icon_size = 64, + default_temperature = 15, + max_temperature = 1500, + heat_capacity = '100kJ', + base_color = { r=0.92, g=0.29, b=0.22 }, + flow_color = { r=0.92, g=0.29, b=0.22 }, + pressure_to_speed_ratio = 0.400, + flow_to_energy_ratio = 0, + subgroup = 'fi_item_subgroup_f', + order = 'a-a', + }, + { + name = 'fu_arc_pure_lead', + type = 'fluid', + icon = sprite('fu_arc_pure_lead.png'), + icon_size = 64, + default_temperature = 15, + max_temperature = 1500, + heat_capacity = '100kJ', + base_color = { r=0.92, g=0.29, b=0.22 }, + flow_color = { r=0.92, g=0.29, b=0.22 }, + pressure_to_speed_ratio = 0.400, + flow_to_energy_ratio = 0, + subgroup = 'fi_item_subgroup_f', + order = 'a-a', + }, + { + name = 'fi_strong_acid', + type = 'fluid', + icon = sprite('fi_strong_acid.png'), + icon_size = 64, + default_temperature = 15, + max_temperature = 1500, + heat_capacity = '100kJ', + base_color = { r=0.92, g=0.29, b=0.22 }, + flow_color = { r=0.92, g=0.29, b=0.22 }, + pressure_to_speed_ratio = 0.400, + flow_to_energy_ratio = 0, + subgroup = 'fi_item_subgroup_f', + order = 'a-a', + }, + { + name = 'fi_dirty_water', + type = 'fluid', + icon = sprite('fi_dirty_water.png'), + icon_size = 64, + default_temperature = 15, + max_temperature = 1500, + heat_capacity = '100kJ', + base_color = { r=0.92, g=0.29, b=0.22 }, + flow_color = { r=0.92, g=0.29, b=0.22 }, + pressure_to_speed_ratio = 0.400, + flow_to_energy_ratio = 0, + subgroup = 'fi_item_subgroup_f', + order = 'a-a', + }, + { + name = 'fu_metal_foam', + type = 'fluid', + icon = sprite('fu_metal_foam.png'), + icon_size = 64, + default_temperature = 15, + max_temperature = 1500, + heat_capacity = '100kJ', + base_color = { r=0.92, g=0.29, b=0.22 }, + flow_color = { r=0.92, g=0.29, b=0.22 }, + pressure_to_speed_ratio = 0.400, + flow_to_energy_ratio = 0, + subgroup = 'fu_item_subgroup_f', + order = 'a-a', + }, }) \ No newline at end of file diff --git a/prototypes/248k_subgroups.lua b/prototypes/248k_subgroups.lua index 5c3ddf4..98c87cc 100644 --- a/prototypes/248k_subgroups.lua +++ b/prototypes/248k_subgroups.lua @@ -415,6 +415,42 @@ data:extend({ name = 'el_special_fluid', type = 'recipe-category', }, + { + name = 'el_purifier_category', + type = 'recipe-category', + }, + { + name = 'el_arc_furnace_category', + type = 'recipe-category', + }, + { + name = 'el_caster_category', + type = 'recipe-category', + }, + { + name = 'el_grower_category', + type = 'recipe-category', + }, + { + name = 'fi_fiberer_category', + type = 'recipe-category', + }, + { + name = 'fi_compound_machine_category', + type = 'recipe-category', + }, + { + name = 'fu_laser_category', + type = 'recipe-category', + }, + { + name = 'fu_plasma_category', + type = 'recipe-category', + }, + { + name = 'fu_magnet_category', + type = 'recipe-category', + }, { name = "gr_cooker_fluid", type = "recipe-category" diff --git a/prototypes/248k_techs.lua b/prototypes/248k_techs.lua index 3ab743f..9d0073a 100644 --- a/prototypes/248k_techs.lua +++ b/prototypes/248k_techs.lua @@ -31,7 +31,7 @@ data:extend({ type = 'technology', icon = sprite('el_energy_tech.png'), icon_size = 128, - prerequisites = {'el_stage_tech'}, + prerequisites = {'el_ALK_tech','el_lithium_tech'}, effects = { { type = 'nothing', @@ -95,6 +95,164 @@ data:extend({ time = 30, }, }, + { + name = 'el_arc_furnace_tech', + type = 'technology', + icon = sprite('el_arc_furnace_tech.png'), + icon_size = 128, + prerequisites = {'el_purifier_tech'}, + effects = { + { + type = 'unlock-recipe', + recipe = 'el_arc_furnace_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'el_arc_pure_iron_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'el_arc_pure_copper_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'el_arc_pure_aluminum_recipe', + }, + }, + unit = { + count = '150', + ingredients = { + {'automation-science-pack',1}, + {'logistic-science-pack',1}, + }, + time = 30, + }, + }, + { + name = 'el_caster_tech', + type = 'technology', + icon = sprite('el_caster_tech.png'), + icon_size = 128, + prerequisites = {'el_arc_furnace_tech'}, + effects = { + { + type = 'unlock-recipe', + recipe = 'el_caster_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'el_cast_pure_aluminum_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'el_cast_pure_iron_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'el_cast_pure_copper_recipe', + }, + }, + unit = { + count = '150', + ingredients = { + {'automation-science-pack',1}, + {'logistic-science-pack',1}, + }, + time = 30, + }, + }, + { + name = 'el_purifier_tech', + type = 'technology', + icon = sprite('el_purifier_tech.png'), + icon_size = 128, + prerequisites = {'el_stage_tech'}, + effects = { + { + type = 'unlock-recipe', + recipe = 'el_purifier_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'el_purify_stone_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'el_purify_iron_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'el_purify_copper_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'el_purify_stone_acidic_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'el_purify_uranium_acidic_recipe', + } + }, + unit = { + count = '150', + ingredients = { + {'automation-science-pack',1}, + {'logistic-science-pack',1}, + }, + time = 30, + }, + }, + { + name = 'el_grower_tech', + type = 'technology', + icon = sprite('el_grower_tech.png'), + icon_size = 128, + prerequisites = {'el_ALK_tech'}, + effects = { + { + type = 'unlock-recipe', + recipe = 'el_grower_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'el_grow_energy_crystal_recipe', + }, + }, + unit = { + count = '150', + ingredients = { + {'automation-science-pack',1}, + {'logistic-science-pack',1}, + }, + time = 30, + }, + }, + { + name = 'el_ALK_tech', + type = 'technology', + icon = sprite('el_ALK_tech.png'), + icon_size = 128, + prerequisites = {'el_caster_tech'}, + effects = { + { + type = 'unlock-recipe', + recipe = 'el_ceramic_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'el_ALK_recipe', + }, + }, + unit = { + count = '150', + ingredients = { + {'automation-science-pack',1}, + {'logistic-science-pack',1}, + }, + time = 30, + }, + }, + --water generator { name = 'el_water_generator_tech', @@ -127,31 +285,7 @@ data:extend({ }, --aluminum_ore --aluminum_item - { - name = 'el_aluminum_tech', - type = 'technology', - icon = sprite('el_aluminum_tech.png'), - icon_size = 128, - prerequisites = {'el_stage_tech'}, - effects = { - { - type = 'unlock-recipe', - recipe = 'el_aluminum_ore_recipe', - }, - { - type = 'unlock-recipe', - recipe = 'el_aluminum_item_recipe', - }, - }, - unit = { - count = '30', - ingredients = { - {'automation-science-pack',1}, - {'logistic-science-pack',1,}, - }, - time = 30, - }, - }, + --lithium_ore --lithium_item --lithium_basic_battery @@ -161,16 +295,8 @@ data:extend({ type = 'technology', icon = sprite('el_lithium_tech.png'), icon_size = 128, - prerequisites = {'el_stage_tech'}, + prerequisites = {'el_purifier_tech'}, effects = { - { - type = 'unlock-recipe', - recipe = 'el_lithium_ore_recipe', - }, - { - type = 'unlock-recipe', - recipe = 'el_lithium_item_recipe', - }, { type = 'unlock-recipe', recipe = 'el_lithium_basic_battery_recipe', @@ -179,6 +305,10 @@ data:extend({ type = 'unlock-recipe', recipe = 'el_lithium_battery_recipe', }, + { + type = 'unlock-recipe', + recipe = 'el_lithium_ore_recipe', + }, }, unit = { count = '30', @@ -197,7 +327,7 @@ data:extend({ type = 'technology', icon = sprite('el_kerosene_tech.png'), icon_size = 128, - prerequisites = {'el_stage_tech'}, + prerequisites = {'el_ALK_tech'}, effects = { { type = 'unlock-recipe', @@ -236,7 +366,7 @@ data:extend({ type = 'technology', icon = sprite('el_train_tech.png'), icon_size = 128, - prerequisites = {'el_kerosene_tech'}, + prerequisites = {'el_kerosene_tech','el_grower_tech','el_lithium_tech'}, effects = { { type = 'unlock-recipe', @@ -268,39 +398,13 @@ data:extend({ time = 30, }, }, - --el_crystal - { - name = 'el_crystal_tech', - type = 'technology', - icon = sprite('el_crystal_tech.png'), - icon_size = 128, - prerequisites = {'el_stage_tech'}, - effects = { - { - type = 'unlock-recipe', - recipe = 'el_energy_crystal_recipe', - }, - { - type = 'unlock-recipe', - recipe = 'el_train_fuel_diesel_energized_recipe', - }, - }, - unit = { - count = '30', - ingredients = { - {'automation-science-pack',1}, - {'logistic-science-pack',1,}, - }, - time = 30, - }, - }, --el_ki { name = 'el_ki_tech', type = 'technology', icon = sprite('el_ki_tech.png'), icon_size = 128, - prerequisites = {'el_stage_tech'}, + prerequisites = {'el_ALK_tech'}, effects = { { type = 'unlock-recipe', @@ -345,7 +449,7 @@ data:extend({ type = 'technology', icon = sprite('fi_ki_tech.png'), icon_size = 128, - prerequisites = {'el_ki_tech'}, + prerequisites = {'el_ki_tech','fi_materials_tech'}, effects = { { type = 'unlock-recipe', @@ -751,13 +855,11 @@ data:extend({ icon = sprite('fi_stage_tech.png'), icon_size = 128, prerequisites = { - 'el_aluminum_tech', 'el_solar_tech', 'el_burner_tech', 'el_water_generator_tech', 'el_train_tech', - 'el_ki_tech', - 'el_lithium_tech' + 'el_ki_tech' }, effects = { { @@ -781,7 +883,7 @@ data:extend({ type = 'technology', icon = sprite('fi_energy_tech.png'), icon_size = 128, - prerequisites = {'fi_stage_tech'}, + prerequisites = {'fi_materials_tech'}, effects = { { type = 'nothing', @@ -798,13 +900,197 @@ data:extend({ time = 30, }, }, + { + name = 'fi_fiberer_tech', + type = 'technology', + icon = sprite('fi_fiberer_tech.png'), + icon_size = 128, + prerequisites = {'fi_glass_tech'}, + effects = { + { + type = 'unlock-recipe', + recipe = 'fi_fiberer_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fi_natural_fiber_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fi_glass_fiber_recipe', + }, + }, + unit = { + count = '150', + ingredients = { + {'chemical-science-pack',1}, + {'automation-science-pack',1}, + {'logistic-science-pack',1,}, + }, + time = 30, + }, + }, + { + name = 'fi_flourite_tech', + type = 'technology', + icon = sprite('fi_flourite_tech.png'), + icon_size = 128, + prerequisites = {'fi_glass_tech'}, + effects = { + { + type = 'unlock-recipe', + recipe = 'fi_flourite_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fi_strong_acid_recipe', + } + }, + unit = { + count = '150', + ingredients = { + {'chemical-science-pack',1}, + {'automation-science-pack',1}, + {'logistic-science-pack',1,}, + }, + time = 30, + }, + }, + { + name = 'fi_glass_tech', + type = 'technology', + icon = sprite('fi_glass_tech.png'), + icon_size = 128, + prerequisites = {'fi_crusher_tech'}, + effects = { + { + type = 'unlock-recipe', + recipe = 'fi_arc_glass_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fi_cast_glass_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fi_crushed_glass_recipe', + }, + }, + unit = { + count = '150', + ingredients = { + {'chemical-science-pack',1}, + {'automation-science-pack',1}, + {'logistic-science-pack',1,}, + }, + time = 30, + }, + }, + { + name = 'fi_purifier_tech', + type = 'technology', + icon = sprite('fi_purifier_tech.png'), + icon_size = 128, + prerequisites = {'fi_flourite_tech'}, + effects = { + { + type = 'unlock-recipe', + recipe = 'fi_purify_stone_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fi_purify_uranium_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fi_pure_ore_recipe', + }, + }, + unit = { + count = '300', + ingredients = { + {'chemical-science-pack',1}, + {'automation-science-pack',1}, + {'logistic-science-pack',1,}, + }, + time = 30, + }, + }, + { + name = 'fi_purifier_2_tech', + type = 'technology', + icon = sprite('fi_purifier_tech.png'), + icon_size = 128, + prerequisites = {'fi_flourite_tech'}, + effects = { + { + type = 'unlock-recipe', + recipe = 'fi_purify_iron_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fi_purify_copper_recipe', + } + }, + unit = { + count = '300', + ingredients = { + {'chemical-science-pack',1}, + {'automation-science-pack',1}, + {'logistic-science-pack',1,}, + }, + time = 30, + }, + }, + { + name = 'fi_caster_tech', + type = 'technology', + icon = sprite('fi_arc_furnace_tech.png'), + icon_size = 128, + prerequisites = {'fi_purifier_tech'}, + effects = { + { + type = 'unlock-recipe', + recipe = 'fi_arc_pure_gold_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fi_arc_pure_titan_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fi_arc_pure_neodym_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fi_cast_neodym_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fi_cast_gold_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fi_cast_titan_recipe', + }, + }, + unit = { + count = '300', + ingredients = { + {'chemical-science-pack',1}, + {'automation-science-pack',1}, + {'logistic-science-pack',1,}, + }, + time = 30, + }, + }, --fi { name = 'fi_refining_tech', type = 'technology', icon = sprite('fi_refining_tech.png'), icon_size = 128, - prerequisites = {'fi_stage_tech'}, + prerequisites = {'fi_purifier_2_tech'}, effects = { { type = 'unlock-recipe', @@ -814,10 +1100,6 @@ data:extend({ type = 'unlock-recipe', recipe = 'fi_uranium233_recipe', }, - { - type = 'unlock-recipe', - recipe = 'fi_thorium232_recipe', - }, { type = 'unlock-recipe', recipe = 'fi_basic_fuel_recipe', @@ -841,14 +1123,40 @@ data:extend({ { name = 'fi_materials_tech', type = 'technology', - icon = sprite('fi_materials_tech.png'), + icon = sprite('fi_compound_machine_tech.png'), icon_size = 128, - prerequisites = {'fi_stage_tech'}, + prerequisites = {'fi_fiberer_tech','fi_caster_tech'}, effects = { { type = 'unlock-recipe', - recipe = 'fi_compound_material_recipe', + recipe = 'fi_compound_machine_recipe', }, + { + type = 'unlock-recipe', + recipe = 'fi_NFK_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fi_GFK_recipe', + } + }, + unit = { + count = '150', + ingredients = { + {'chemical-science-pack',1}, + {'automation-science-pack',1}, + {'logistic-science-pack',1,}, + }, + time = 30, + }, + }, + { + name = 'fi_crafter_tech', + type = 'technology', + icon = sprite('fi_crafter_tech.png'), + icon_size = 128, + prerequisites = {'fi_materials_tech'}, + effects = { { type = 'unlock-recipe', recipe = 'fi_crafter_recipe', @@ -868,36 +1176,13 @@ data:extend({ time = 30, }, }, - --fi_miner - { - name = 'fi_miner_tech', - type = 'technology', - icon = sprite('fi_miner_tech.png'), - icon_size = 128, - prerequisites = {'fi_stage_tech'}, - effects = { - { - type = 'unlock-recipe', - recipe = 'fi_miner_recipe', - }, - }, - unit = { - count = '150', - ingredients = { - {'chemical-science-pack',1}, - {'automation-science-pack',1}, - {'logistic-science-pack',1,}, - }, - time = 30, - }, - }, --fi_train { name = 'fi_train_tech', type = 'technology', icon = sprite('fi_train_tech.png'), icon_size = 128, - prerequisites = {'fi_stage_tech'}, + prerequisites = {'fi_energy_tech'}, effects = { { type = 'unlock-recipe', @@ -931,7 +1216,7 @@ data:extend({ type = 'technology', icon = sprite('fi_solid_reactor_tech.png'), icon_size = 128, - prerequisites = {'fi_energy_tech'}, + prerequisites = {'fi_energy_tech','fi_refining_tech'}, effects = { { type = 'unlock-recipe', @@ -1009,6 +1294,14 @@ data:extend({ type = 'unlock-recipe', recipe = 'fi_crushed_coal_recipe', }, + { + type = 'unlock-recipe', + recipe = 'fi_crushed_stone_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fi_crushed_uranium_recipe', + }, }, unit = { count = '200', @@ -1026,20 +1319,12 @@ data:extend({ type = 'technology', icon = sprite('fi_crystal_tech.png'), icon_size = 128, - prerequisites = {'fi_crusher_tech'}, + prerequisites = {'fi_materials_tech'}, effects = { { type = 'unlock-recipe', recipe = 'fi_energy_crystal_recipe', }, - { - type = 'unlock-recipe', - recipe = 'fi_catalyst_crystal_recipe', - }, - { - type = 'unlock-recipe', - recipe = 'fi_base_crystal_recipe', - }, { type = 'unlock-recipe', recipe = 'fi_crystal_fluid_recipe', @@ -1059,44 +1344,13 @@ data:extend({ time = 30, }, }, - --blends - { - name = 'fi_blends_tech', - type = 'technology', - icon = sprite('fi_blends_tech.png'), - icon_size = 128, - prerequisites = {'fi_materials_tech','fi_crusher_tech'}, - effects = { - { - type = 'unlock-recipe', - recipe = 'fi_materials_industrial_steel_blend_recipe', - }, - { - type = 'unlock-recipe', - recipe = 'fi_materials_industrial_steel_recipe', - }, - { - type = 'unlock-recipe', - recipe = 'fi_materials_steel_recipe', - }, - }, - unit = { - count = '300', - ingredients = { - {'chemical-science-pack',1}, - {'automation-science-pack',1}, - {'logistic-science-pack',1,}, - }, - time = 30, - }, - }, --robo { name = 'fi_robo_tech', type = 'technology', icon = sprite('fi_robo_tech.png'), icon_size = 128, - prerequisites = {'fi_materials_tech','fi_miner_tech'}, + prerequisites = {'fi_materials_tech'}, effects = { { type = 'unlock-recipe', @@ -1175,7 +1429,7 @@ data:extend({ type = 'technology', icon = sprite('fi_modules_3_tech.png'), icon_size = 128, - prerequisites = {'fi_modules_2_tech','fu_fusor_tech'}, + prerequisites = {'fi_modules_2_tech','fu_energy_tech'}, effects = { { type = 'unlock-recipe', @@ -1281,9 +1535,7 @@ data:extend({ prerequisites = { 'fi_crystal_tech', 'fi_solid_reactor_tech', - 'fi_blends_tech', 'fi_robo_tech', - 'fi_refining_tech', 'fi_train_tech' }, effects = { @@ -1303,6 +1555,161 @@ data:extend({ time = 45, }, }, + { + name = 'fu_laser_tech', + type = 'technology', + icon = sprite('fu_laser_tech.png'), + icon_size = 128, + prerequisites = { + 'fu_lead_tech', + }, + effects = { + { + type = 'unlock-recipe', + recipe = 'fu_laser_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fu_laser_card_recipe', + }, + + }, + unit = { + count = '800', + ingredients = { + {'chemical-science-pack',1}, + {'automation-science-pack',1}, + {'logistic-science-pack',1}, + {'production-science-pack',1}, + {'utility-science-pack',1}, + }, + time = 45, + }, + }, + { + name = 'fu_plasma_tech', + type = 'technology', + icon = sprite('fu_plasma_tech.png'), + icon_size = 128, + prerequisites = { + 'fu_lead_tech', + }, + effects = { + { + type = 'unlock-recipe', + recipe = 'fu_plasma_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fu_plasma_card_recipe', + }, + }, + unit = { + count = '800', + ingredients = { + {'chemical-science-pack',1}, + {'automation-science-pack',1}, + {'logistic-science-pack',1}, + {'production-science-pack',1}, + {'utility-science-pack',1}, + }, + time = 45, + }, + }, + { + name = 'fu_magnet_tech', + type = 'technology', + icon = sprite('fu_magnet_tech.png'), + icon_size = 128, + prerequisites = { + 'fu_lead_tech', + }, + effects = { + { + type = 'unlock-recipe', + recipe = 'fu_magnet_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fu_magnet_1_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fu_magnet_card_recipe', + }, + }, + unit = { + count = '800', + ingredients = { + {'chemical-science-pack',1}, + {'automation-science-pack',1}, + {'logistic-science-pack',1}, + {'production-science-pack',1}, + {'utility-science-pack',1}, + }, + time = 45, + }, + }, + { + name = 'fu_KFK_tech', + type = 'technology', + icon = sprite('fu_KFK_tech.png'), + icon_size = 128, + prerequisites = { + 'fu_stage_tech', + }, + effects = { + { + type = 'unlock-recipe', + recipe = 'fu_KFK_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fu_carbon_fiber_recipe', + }, + }, + unit = { + count = '800', + ingredients = { + {'chemical-science-pack',1}, + {'automation-science-pack',1}, + {'logistic-science-pack',1}, + {'production-science-pack',1}, + {'utility-science-pack',1}, + }, + time = 45, + }, + }, + { + name = 'fu_TIM_tech', + type = 'technology', + icon = sprite('fu_TIM_tech.png'), + icon_size = 128, + prerequisites = { + 'fu_stage_tech', + }, + effects = { + { + type = 'unlock-recipe', + recipe = 'fu_TIM_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fu_metal_foam_recipe', + }, + }, + unit = { + count = '800', + ingredients = { + {'chemical-science-pack',1}, + {'automation-science-pack',1}, + {'logistic-science-pack',1}, + {'production-science-pack',1}, + {'utility-science-pack',1}, + }, + time = 45, + }, + }, --fu fusor { name = 'fu_fusor_tech', @@ -1310,7 +1717,7 @@ data:extend({ icon = sprite('fu_fusor_tech.png'), icon_size = 128, prerequisites = { - 'fu_stage_tech', + 'fu_lead_tech', }, effects = { { @@ -1319,31 +1726,31 @@ data:extend({ }, { type = 'unlock-recipe', - recipe = 'fu_tech_sign_1_recipe', + recipe = 'fu_fusion_card_1_recipe', }, { type = 'unlock-recipe', - recipe = 'fu_tech_sign_2_recipe', + recipe = 'fu_fusion_card_2_recipe', }, { type = 'unlock-recipe', - recipe = 'fu_tech_sign_3_recipe', + recipe = 'fu_fusion_card_3_recipe', }, { type = 'unlock-recipe', - recipe = 'fu_tech_sign_4_recipe', + recipe = 'fu_fusion_card_4_recipe', }, { type = 'unlock-recipe', - recipe = 'fu_tech_sign_5_recipe', + recipe = 'fu_fusion_card_5_recipe', }, { type = 'unlock-recipe', - recipe = 'fu_tech_sign_6_recipe', + recipe = 'fu_fusion_card_6_recipe', }, { type = 'unlock-recipe', - recipe = 'fu_tech_sign_7_recipe', + recipe = 'fu_fusion_card_7_recipe', }, { type = 'nothing', @@ -1368,7 +1775,7 @@ data:extend({ icon = sprite('fu_basic_elements_tech.png'), icon_size = 128, prerequisites = { - 'fu_stage_tech', + 'fu_fusor_tech', }, effects = { { @@ -1493,24 +1900,16 @@ data:extend({ type = 'technology', icon = sprite('fu_energy_tech.png'), icon_size = 128, - prerequisites = {'fu_fusor_tech'}, + prerequisites = {'fu_fusor_tech','fu_laser_tech','fu_magnet_tech','fu_plasma_tech'}, effects = { - { - type = 'unlock-recipe', - recipe = 'fu_exchanger_item_recipe', - }, - { - type = 'unlock-recipe', - recipe = 'fu_exchanger_1_recipe', - }, - { - type = 'unlock-recipe', - recipe = 'fu_exchanger_2_recipe', - }, { type = 'nothing', effect_description = {'description.fu_energy_eff'}, }, + { + type = 'unlock-recipe', + recipe = 'fu_tech_sign_recipe', + }, }, unit = { count = '200', @@ -1528,12 +1927,16 @@ data:extend({ type = 'technology', icon = sprite('fu_crystal_tech.png'), icon_size = 128, - prerequisites = {'fu_stage_tech'}, + prerequisites = {'fu_laser_tech'}, effects = { { type = 'unlock-recipe', - recipe = 'fu_crystal_from_fluid_recipe', - } + recipe = 'fu_laser_crystal_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fu_refined_crystal_recipe', + }, }, unit = { count = '1000', @@ -1552,12 +1955,8 @@ data:extend({ type = 'technology', icon = sprite('fu_lead_tech.png'), icon_size = 128, - prerequisites = {'fu_stage_tech'}, + prerequisites = {'fu_KFK_tech','fu_TIM_tech'}, effects = { - { - type = 'unlock-recipe', - recipe = 'fu_lead_ore_recipe', - }, { type = 'unlock-recipe', recipe = 'fu_lead_recipe', @@ -1570,6 +1969,26 @@ data:extend({ type = 'unlock-recipe', recipe = 'fu_lead_molten_recipe', }, + { + type = 'unlock-recipe', + recipe = 'fu_arc_pure_lead_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fu_pure_ore_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fu_exchanger_item_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fu_exchanger_1_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fu_exchanger_2_recipe', + }, }, unit = { count = '200', @@ -1628,7 +2047,7 @@ data:extend({ type = 'technology', icon = sprite('fu_robo_tech.png'), icon_size = 128, - prerequisites = {'fu_fusor_tech'}, + prerequisites = {'fu_energy_tech'}, effects = { { type = 'unlock-recipe', diff --git a/prototypes/el_recipes.lua b/prototypes/el_recipes.lua index 0c9ce43..63e51d2 100644 --- a/prototypes/el_recipes.lua +++ b/prototypes/el_recipes.lua @@ -30,67 +30,7 @@ data:extend({ order = 'a-a-2', }, --el_aluminum_ore - { - name = 'el_aluminum_ore_recipe', - type = 'recipe', - enabled = 'false', - category = 'crafting-with-fluid', - ingredients = { - {'stone',2}, - {type="fluid", name="sulfuric-acid", amount=20}, - }, - result = 'el_aluminum_ore_item', - result_count = 4, - energy_required = 2, - always_show_made_in = true, - order = 'a-a', - }, - --el_aluminum_item - { - name = 'el_aluminum_item_recipe', - type = 'recipe', - enabled = 'false', - category = 'smelting', - ingredients = { - {'el_aluminum_ore_item',2}, - }, - result = 'el_aluminum_item', - result_count = 4, - energy_required = 2, - always_show_made_in = true, - order = 'a-c', - }, - --el_lithium_ore - { - name = 'el_lithium_ore_recipe', - type = 'recipe', - enabled = 'false', - category = 'crafting-with-fluid', - ingredients = { - {'stone',2}, - {type="fluid", name="sulfuric-acid", amount=20}, - }, - result = 'el_lithium_ore_item', - result_count = 4, - energy_required = 2, - always_show_made_in = true, - order = 'a-b', - }, - --el_lithium_item - { - name = 'el_lithium_item_recipe', - type = 'recipe', - enabled = 'false', - category = 'smelting', - ingredients = { - {'el_lithium_ore_item',2}, - }, - result = 'el_lithium_item', - result_count = 4, - energy_required = 2, - always_show_made_in = true, - order = 'a-d', - }, + --el_lithium_basic_battery { name = 'el_lithium_basic_battery_recipe', @@ -132,7 +72,7 @@ data:extend({ ingredients = { {'iron-gear-wheel',40}, {'steel-plate',15}, - {'el_aluminum_item',15}, + {'el_materials_ALK',10}, {'electronic-circuit',10} }, result = 'el_burner_item', @@ -162,7 +102,7 @@ data:extend({ ingredients = { {'iron-gear-wheel',60}, {'engine-unit',15}, - {'el_aluminum_item',30}, + {'el_materials_ALK',20}, {'electronic-circuit',20}, {'pipe',30}, {'copper-cable',20}, @@ -180,7 +120,7 @@ data:extend({ ingredients = { {'iron-gear-wheel',40}, {'pipe',40}, - {'el_aluminum_item',15}, + {'el_materials_ALK',10}, {'electronic-circuit',15} }, result = 'el_pressurizer_item', @@ -216,8 +156,8 @@ data:extend({ {'locomotive',1}, {'engine-unit',15}, {'iron-gear-wheel',40}, - {'advanced-circuit',25}, - {'el_aluminum_item',25}, + {'advanced-circuit',15}, + {'el_materials_ALK',25}, }, result = 'el_diesel_train_item', result_count = 1, @@ -348,19 +288,20 @@ data:extend({ }, --el_energy_crystal { - name = 'el_energy_crystal_recipe', + name = 'el_grow_energy_crystal_recipe', type = 'recipe', enabled = 'false', - category = 'crafting-with-fluid', + category = 'el_grower_category', ingredients = { - {type="item", name="stone", amount=10}, - {type="fluid", name="el_acidic_water", amount=30}, + {type="item", name="el_energy_crystal_item", amount=1}, + {type="fluid", name="el_acidic_water", amount=15}, }, results = { - {type="item", name="el_energy_crystal_item", amount=3}, + {type="item", name="el_energy_crystal_item", amount=2}, }, result_count = 1, - energy_required = 10, + energy_required = 30, + always_show_made_in = true }, --el_energy_crystal_fuel { @@ -387,7 +328,7 @@ data:extend({ category = 'crafting', ingredients = { {type="item", name="steel-plate", amount=20}, - {type="item", name="el_aluminum_item", amount=10}, + {type="item", name="el_materials_ALK", amount=10}, {type="item", name="electronic-circuit", amount=20}, }, results = { @@ -403,7 +344,7 @@ data:extend({ category = 'crafting', ingredients = { {type="item", name="steel-plate", amount=20}, - {type="item", name="low-density-structure", amount=10}, + {type="item", name="fi_materials_neodym", amount=5}, {type="item", name="advanced-circuit", amount=20}, {type="item", name="el_ki_beacon_item", amount=1}, }, @@ -441,7 +382,7 @@ data:extend({ {type="item", name="concrete", amount=500}, {type="item", name="electronic-circuit", amount=100}, {type="item", name="advanced-circuit", amount=100}, - {type="item", name="el_aluminum_item", amount=140}, + {type="item", name="el_materials_ALK", amount=140}, {type="item", name="el_energy_crystal_item", amount=40}, {type="item", name="el_solar_item", amount=10}, {type="item", name="el_lithium_battery", amount=40}, @@ -461,7 +402,7 @@ data:extend({ category = 'crafting', ingredients = { {type="item", name="fi_crafter_item", amount=10}, - {type="item", name="fi_miner_item", amount=10}, + {type="item", name="fi_materials_neodym", amount=100}, {type="item", name="fi_crusher_item", amount=10}, {type="item", name="fi_modules_core_item", amount=20}, {type="item", name="low-density-structure", amount=100}, @@ -509,7 +450,7 @@ data:extend({ {type="item", name="steel-plate", amount=40}, {type="item", name="concrete", amount=60}, {type="item", name="advanced-circuit", amount=100}, - {type="item", name="el_aluminum_item", amount=100}, + {type="item", name="el_materials_ALK", amount=100}, }, results = { {type="item", name="el_ki_memory_item", amount=1}, @@ -523,10 +464,10 @@ data:extend({ enabled = 'false', category = 'crafting', ingredients = { - {type="item", name="fi_industrial_steel_item", amount=80}, + {type="item", name="fi_materials_neodym", amount=20}, {type="item", name="concrete", amount=120}, {type="item", name="advanced-circuit", amount=100}, - {type="item", name="low-density-structure", amount=100}, + {type="item", name="fi_materials_GFK", amount=100}, }, results = { {type="item", name="fi_ki_circuit_item", amount=1}, @@ -756,7 +697,7 @@ data:extend({ {type="item", name="steel-plate", amount=40}, {type="item", name="concrete", amount=60}, {type="item", name="advanced-circuit", amount=100}, - {type="item", name="el_aluminum_item", amount=100}, + {type="item", name="el_materials_ALK", amount=100}, }, results = { {type="item", name="el_ki_cpu_item", amount=1}, @@ -882,7 +823,318 @@ data:extend({ results = {}, energy_required = 15, }, + { + name = 'el_arc_furnace_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting', + ingredients = { + {'iron-gear-wheel',40}, + {'steel-plate',25}, + {'stone-furnace',2} + }, + result = 'el_arc_furnace_item', + result_count = 1, + energy_required = 4, + }, + { + name = 'el_caster_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting', + ingredients = { + {'iron-gear-wheel',40}, + {'steel-plate',25}, + {'electronic-circuit',20} + }, + result = 'el_caster_item', + result_count = 1, + energy_required = 4, + }, + { + name = 'el_purifier_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting', + ingredients = { + {'iron-gear-wheel',40}, + {'steel-plate',15}, + {'electronic-circuit',10} + }, + result = 'el_purifier_item', + result_count = 1, + energy_required = 4, + }, + { + name = 'el_grower_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting', + ingredients = { + {'iron-gear-wheel',40}, + {'steel-plate',15}, + {'el_materials_ALK',15}, + {'electronic-circuit',10} + }, + result = 'el_grower_item', + result_count = 1, + energy_required = 4, + }, + + { + name = 'el_purify_stone_recipe', + type = 'recipe', + enabled = 'false', + category = 'el_purifier_category', + main_product = 'el_dirty_water', + ingredients = { + {type="fluid", name="water", amount=100}, + --{type="fluid", name="steam", amount=240, temperature=165}, + {type="item", name="stone", amount=10} + }, + results = { + {type="fluid", name="el_dirty_water", amount=100}, + {type="item", name="el_materials_pure_iron", amount=1}, + {type="item", name="el_materials_pure_copper", amount=1}, + {type="item", name="el_materials_pure_aluminum", amount=2}, + }, + energy_required = 1, + always_show_made_in = true + }, + { + name = 'el_purify_iron_recipe', + type = 'recipe', + enabled = 'false', + category = 'el_purifier_category', + main_product = 'el_dirty_water', + ingredients = { + {type="fluid", name="water", amount=50}, + --{type="fluid", name="steam", amount=240, temperature=165}, + {type="item", name="iron-ore", amount=10} + }, + results = { + {type="fluid", name="el_dirty_water", amount=50}, + {type="item", name="el_materials_pure_iron", amount=5}, + }, + energy_required = 1, + always_show_made_in = true + }, + { + name = 'el_purify_copper_recipe', + type = 'recipe', + enabled = 'false', + category = 'el_purifier_category', + main_product = 'el_dirty_water', + ingredients = { + {type="fluid", name="water", amount=50}, + --{type="fluid", name="steam", amount=240, temperature=165}, + {type="item", name="copper-ore", amount=10} + }, + results = { + {type="fluid", name="el_dirty_water", amount=50}, + {type="item", name="el_materials_pure_copper", amount=5}, + }, + energy_required = 1, + always_show_made_in = true + }, + { + name = 'el_purify_stone_acidic_recipe', + type = 'recipe', + enabled = 'false', + category = 'el_purifier_category', + main_product = 'el_energy_crystal_item', + ingredients = { + {type="fluid", name="el_acidic_water", amount=200}, + {type="fluid", name="water", amount=50}, + --{type="fluid", name="steam", amount=240, temperature=165}, + {type="item", name="stone", amount=10} + }, + results = { + {type="fluid", name="el_dirty_water", amount=50}, + {type="item", name="el_energy_crystal_item", amount=1}, + {type="item", name="el_materials_pure_iron", amount=1}, + {type="item", name="el_materials_pure_copper", amount=1}, + }, + energy_required = 2, + always_show_made_in = true + }, + { + name = 'el_purify_uranium_acidic_recipe', + type = 'recipe', + enabled = 'false', + category = 'el_purifier_category', + main_product = 'el_energy_crystal_item', + ingredients = { + {type="fluid", name="el_acidic_water", amount=1000}, + {type="fluid", name="water", amount=500}, + --{type="fluid", name="steam", amount=240, temperature=165}, + {type="item", name="uranium-ore", amount=100} + }, + results = { + {type="fluid", name="el_dirty_water", amount=500}, + {type="item", name="el_energy_crystal_item", amount=50}, + {type="item", name="uranium-238", amount=9}, + {type="item", name="uranium-235", amount=1}, + }, + energy_required = 10, + always_show_made_in = true + }, + + + { + name = 'el_aluminum_item_recipe', + type = 'recipe', + enabled = 'false', + category = 'smelting', + ingredients = { + {'el_aluminum_ore_item',2}, + }, + result = 'el_aluminum_item', + result_count = 4, + energy_required = 2, + always_show_made_in = true, + order = 'a-c', + }, + { + name = 'el_lithium_ore_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting-with-fluid', + main_product = 'el_lithium_item', + ingredients = { + {type="fluid", name="el_dirty_water", amount=100}, + }, + results = { + {type="fluid", name="water", amount=100}, + {type="item", name="el_lithium_item", amount=1}, + }, + energy_required = 0.2, + order = 'a-b', + }, + { + name = 'el_arc_pure_iron_recipe', + type = 'recipe', + enabled = 'false', + category = 'el_arc_furnace_category', + ingredients = { + {type="item", name="el_materials_pure_iron", amount=1}, + }, + results = { + {type="fluid", name="el_arc_pure_iron", amount=200}, + }, + energy_required = 0.2, + order = 'a-b', + always_show_made_in = true + }, + { + name = 'el_cast_pure_iron_recipe', + type = 'recipe', + enabled = 'false', + category = 'el_caster_category', + ingredients = { + {type="fluid", name="el_arc_pure_iron", amount=100}, + }, + results = { + {type="item", name="iron-plate", amount=1}, + }, + energy_required = 0.2, + order = 'a-b', + always_show_made_in = true, + allow_decomposition = false + }, + { + name = 'el_arc_pure_copper_recipe', + type = 'recipe', + enabled = 'false', + category = 'el_arc_furnace_category', + ingredients = { + {type="item", name="el_materials_pure_copper", amount=1}, + }, + results = { + {type="fluid", name="el_arc_pure_copper", amount=200}, + }, + energy_required = 0.2, + order = 'a-b', + always_show_made_in = true + }, + { + name = 'el_cast_pure_copper_recipe', + type = 'recipe', + enabled = 'false', + category = 'el_caster_category', + ingredients = { + {type="fluid", name="el_arc_pure_copper", amount=100}, + }, + results = { + {type="item", name="copper-plate", amount=1}, + }, + energy_required = 0.2, + order = 'a-b', + always_show_made_in = true, + allow_decomposition = false + }, + { + name = 'el_arc_pure_aluminum_recipe', + type = 'recipe', + enabled = 'false', + category = 'el_arc_furnace_category', + ingredients = { + {type="item", name="el_materials_pure_aluminum", amount=1}, + }, + results = { + {type="fluid", name="el_arc_pure_aluminum", amount=200}, + }, + energy_required = 0.2, + order = 'a-b', + always_show_made_in = true + }, + { + name = 'el_cast_pure_aluminum_recipe', + type = 'recipe', + enabled = 'false', + category = 'el_caster_category', + ingredients = { + {type="fluid", name="el_arc_pure_aluminum", amount=100}, + }, + results = { + {type="item", name="el_aluminum_item", amount=1}, + }, + energy_required = 0.2, + order = 'a-b', + always_show_made_in = true + }, + + { + name = 'el_ceramic_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting-with-fluid', + ingredients = { + {type="fluid", name="steam", amount=100}, + {type="item", name="stone", amount=2}, + }, + results = { + {type="item", name="el_materials_ceramic", amount=1}, + }, + energy_required = 1, + order = 'a-b', + }, + { + name = 'el_ALK_recipe', + type = 'recipe', + enabled = 'false', + ingredients = { + {type="item", name="el_materials_ceramic", amount=2}, + {type="item", name="el_aluminum_item", amount=6}, + }, + results = { + {type="item", name="el_materials_ALK", amount=3}, + }, + energy_required = 1, + order = 'a-b', + }, + }) diff --git a/prototypes/electronic/el_arc_furnace.lua b/prototypes/electronic/el_arc_furnace.lua new file mode 100644 index 0000000..b9ec303 --- /dev/null +++ b/prototypes/electronic/el_arc_furnace.lua @@ -0,0 +1,177 @@ +--local functions +local function config(name) + return settings.startup['el_arc_furnace_'..name].value +end + +local function sprite(name) + return '__248k__/ressources/electronic/el_arc_furnace/el_arc_furnace_'..name +end + +--item +data:extend({ + { + name = 'el_arc_furnace_item', + type = 'item', + icon = sprite('icon.png'), + icon_size = 64, + place_result = 'el_arc_furnace_entity', + stack_size = 20, + subgroup = 'el_item_subgroup_c', + order = 'a-b', + }, + +}) + +--entity +data:extend({ + --prototype + { + name = 'el_arc_furnace_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 = 'el_arc_furnace_item', + }, + crafting_categories = {'el_arc_furnace_category'}, + crafting_speed = 1, + --fixed_recipe = 'el_water_pressure_recipe', + energy_source = { + type = 'electric', + usage_priority = 'secondary-input', + }, + allowed_effects = {"speed", "consumption", "pollution"}, + module_specification = { + module_info_icon_shift = { + 0, + 0.8 + }, + module_slots = 2 + }, + energy_usage = '400kW', + fluid_boxes = { + { + + base_area = 1, + height = 2, + base_level = 1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {type = "output", position = {0, -4}}, + }, + production_type = "output" + }, + { + + base_area = 1, + height = 2, + base_level = 1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {type = "output", position = {-4, 0}} + }, + production_type = "output" + }, + { + + base_area = 1, + height = 2, + base_level = 1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {type = "output", position = {4, 0}}, + --{type = "output", position = {2, -2.5}} + }, + production_type = "output" + }, + { + + base_area = 1, + height = 2, + base_level = 1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {type = "output", position = {0, 4}}, + }, + production_type = "output" + }, + }, + --animation + animation = { + north = { + filename = sprite('entity_animation.png'), + size = {512,512}, + scale = 0.54, + line_length = 3, + frame_count = 3, + animation_speed = 0.5, + shift = {0,-0.1} + }, + east = { + filename = sprite('entity_animation.png'), + size = {512,512}, + scale = 0.54, + line_length = 3, + --lines_per_file = 3, + frame_count = 3, + animation_speed = 0.5, + shift = {0,-0.1} + }, + south = { + filename = sprite('entity_animation.png'), + size = {512,512}, + scale = 0.54, + line_length = 3, + frame_count = 3, + animation_speed = 0.5, + shift = {0,-0.1} + }, + west = { + filename = sprite('entity_animation.png'), + size = {512,512}, + scale = 0.54, + line_length = 3, + frame_count = 3, + animation_speed = 0.5, + shift = {0,-0.1} + }, + }, + working_sound = + { + sound = {filename = "__base__/sound/chemical-plant-3.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/electronic/el_caster.lua b/prototypes/electronic/el_caster.lua new file mode 100644 index 0000000..c04eae9 --- /dev/null +++ b/prototypes/electronic/el_caster.lua @@ -0,0 +1,181 @@ +--local functions +local function config(name) + return settings.startup['el_caster_'..name].value +end + +local function sprite(name) + return '__248k__/ressources/electronic/el_caster/el_caster_'..name +end + +--item +data:extend({ + { + name = 'el_caster_item', + type = 'item', + icon = sprite('icon.png'), + icon_size = 64, + place_result = 'el_caster_entity', + stack_size = 20, + subgroup = 'el_item_subgroup_c', + order = 'a-b', + }, + +}) + +--entity +data:extend({ + --prototype + { + name = 'el_caster_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 = 'el_caster_item', + }, + crafting_categories = {'el_caster_category'}, + crafting_speed = 1, + ingredient_count = 2, + --fixed_recipe = 'el_water_pressure_recipe', + energy_source = { + type = 'electric', + usage_priority = 'secondary-input', + }, + allowed_effects = {"speed", "consumption", "pollution"}, + module_specification = { + module_info_icon_shift = { + 0, + 0.8 + }, + module_slots = 2 + }, + energy_usage = '100kW', + fluid_boxes = { + { + + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {type = "input", position = {0, -4}}, + }, + production_type = "input" + }, + { + + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {type = "input", position = {-4, 0}} + }, + production_type = "input" + }, + { + + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + 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_connections = + { + {type = "input", position = {0, 4}}, + }, + production_type = "input" + }, + }, + --animation + animation = { + north = { + filename = sprite('entity_animation.png'), + size = {512,512}, + scale = 0.54, + line_length = 3, + lines_per_file = 3, + frame_count = 9, + animation_speed = 0.2, + shift = {0,-0.1} + }, + east = { + filename = sprite('entity_animation.png'), + size = {512,512}, + scale = 0.54, + line_length = 3, + lines_per_file = 3, + frame_count = 9, + animation_speed = 0.2, + shift = {0,-0.1} + }, + south = { + filename = sprite('entity_animation.png'), + size = {512,512}, + scale = 0.54, + line_length = 3, + lines_per_file = 3, + frame_count = 9, + animation_speed = 0.2, + shift = {0,-0.1} + }, + west = { + filename = sprite('entity_animation.png'), + size = {512,512}, + scale = 0.54, + line_length = 3, + lines_per_file = 3, + frame_count = 9, + animation_speed = 0.2, + shift = {0,-0.1} + }, + }, + working_sound = + { + sound = {filename = "__base__/sound/chemical-plant-3.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/electronic/el_grower.lua b/prototypes/electronic/el_grower.lua new file mode 100644 index 0000000..80ada17 --- /dev/null +++ b/prototypes/electronic/el_grower.lua @@ -0,0 +1,152 @@ +--local functions +local function config(name) + return settings.startup['el_grower_'..name].value +end + +local function sprite(name) + return '__248k__/ressources/electronic/el_grower/el_grower_'..name +end + +--item +data:extend({ + { + name = 'el_grower_item', + type = 'item', + icon = sprite('icon.png'), + icon_size = 64, + place_result = 'el_grower_entity', + stack_size = 20, + subgroup = 'el_item_subgroup_c', + order = 'a-b', + }, + +}) + +--entity +data:extend({ +--prototype +{ + name = 'el_grower_entity', + type = 'assembling-machine', + icon = sprite('icon.png'), + icon_size = 64, + flags = {"player-creation","placeable-neutral"}, + max_health = 300, + corpse = 'big-remnants', + collision_box = {{-2.4,-2.4},{2.4,2.4}}, + selection_box = {{-2.5,-2.5},{2.5,2.5}}, + map_color = {r=0, g=0, b=1, a=1}, + minable = { + mining_time = 1, + result = 'el_grower_item', + }, + crafting_categories = {'el_grower_category'}, + crafting_speed = 1, + ingredient_count = 3, + --fixed_recipe = 'el_water_pressure_recipe', + energy_source = { + type = 'electric', + usage_priority = 'secondary-input', + }, + allowed_effects = {"speed", "productivity", "consumption", "pollution"}, + module_specification = { + module_info_icon_shift = { + 0, + 0.8 + }, + module_slots = 2 + }, + energy_usage = '200kW', + fluid_boxes = { + { + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {type = "input", position = {0, -3}}, + }, + production_type = "input" + }, + { + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {type = "input", position = {-3, 0}} + }, + production_type = "input" + }, + { + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {type = "input", position = {3, 0}}, + --{type = "output", position = {2, -2.5}} + }, + production_type = "input" + }, + { + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {type = "input", position = {0, 3}}, + }, + production_type = "input" + }, + }, + --animation + animation = { + north = { + filename = sprite('entity_animation.png'), + size = {512,512}, + scale = 0.32, + line_length = 3, + frame_count = 3, + animation_speed = 0.2, + shift = {0, -0.2} + }, + east = { + filename = sprite('entity_animation.png'), + size = {512,512}, + scale = 0.32, + line_length = 3, + frame_count = 3, + animation_speed = 0.2, + shift = {0, -0.2} + }, + south = { + filename = sprite('entity_animation.png'), + size = {512,512}, + scale = 0.32, + line_length = 3, + frame_count = 3, + animation_speed = 0.2, + shift = {0, -0.2} + }, + west = { + filename = sprite('entity_animation.png'), + size = {512,512}, + scale = 0.32, + line_length = 3, + frame_count = 3, + animation_speed = 0.2, + shift = {0, -0.2} + }, + }, + working_sound = + { + sound = {filename = "__base__/sound/chemical-plant-3.ogg" }, + apparent_volume = 0.3, + }, +}, +}) \ No newline at end of file diff --git a/prototypes/electronic/el_materials.lua b/prototypes/electronic/el_materials.lua new file mode 100644 index 0000000..493a2f3 --- /dev/null +++ b/prototypes/electronic/el_materials.lua @@ -0,0 +1,57 @@ +--local functions +local function config(name) + return settings.startup['el_materials_'..name].value +end + +local function sprite(name) + return '__248k__/ressources/electronic/el_materials/el_materials_'..name +end + +--item +data:extend({ + { + name = 'el_materials_pure_iron', + type = 'item', + icon = sprite('pure_iron.png'), + icon_size = 64, + stack_size = 50, + subgroup = 'el_item_subgroup_a', + order = 'a-a', + }, + { + name = 'el_materials_pure_copper', + type = 'item', + icon = sprite('pure_copper.png'), + icon_size = 64, + stack_size = 50, + subgroup = 'el_item_subgroup_a', + order = 'a-b', + }, + { + name = 'el_materials_pure_aluminum', + type = 'item', + icon = sprite('pure_aluminum.png'), + icon_size = 64, + stack_size = 50, + subgroup = 'el_item_subgroup_a', + order = 'a-c', + }, + { + name = 'el_materials_ceramic', + type = 'item', + icon = sprite('ceramic.png'), + icon_size = 64, + stack_size = 50, + subgroup = 'el_item_subgroup_a', + order = 'a-c', + }, + { + name = 'el_materials_ALK', + type = 'item', + icon = sprite('ALK.png'), + icon_size = 64, + stack_size = 100, + subgroup = 'el_item_subgroup_a', + order = 'a-c', + }, +}) \ No newline at end of file diff --git a/prototypes/electronic/el_purifier.lua b/prototypes/electronic/el_purifier.lua new file mode 100644 index 0000000..8554523 --- /dev/null +++ b/prototypes/electronic/el_purifier.lua @@ -0,0 +1,177 @@ +--local functions +local function config(name) + return settings.startup['el_purifier_'..name].value +end + +local function sprite(name) + return '__248k__/ressources/electronic/el_purifier/el_purifier_'..name +end + +--item +data:extend({ + { + name = 'el_purifier_item', + type = 'item', + icon = sprite('icon.png'), + icon_size = 64, + place_result = 'el_purifier_entity', + stack_size = 20, + subgroup = 'el_item_subgroup_c', + order = 'a-b', + }, + +}) + +--entity +data:extend({ + --prototype + { + name = 'el_purifier_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 = 'el_purifier_item', + }, + crafting_categories = {'el_purifier_category'}, + crafting_speed = 1, + ingredient_count = 2, + --fixed_recipe = 'el_water_pressure_recipe', + energy_source = { + type = 'electric', + usage_priority = 'secondary-input', + }, + allowed_effects = {"speed", "consumption", "pollution"}, + module_specification = { + module_info_icon_shift = { + 0, + 0.8 + }, + module_slots = 2 + }, + energy_usage = '40kW', + fluid_boxes = { + { + filter = 'water', + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {type = "input", position = {0, -4}}, + }, + production_type = "input" + }, + { + filter = 'water', + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {type = "input", position = {-4, 0}} + }, + production_type = "input" + }, + { + filter = 'el_dirty_water', + base_area = 1, + height = 2, + base_level = 1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {type = "output", position = {4, 0}}, + --{type = "output", position = {2, -2.5}} + }, + production_type = "output" + }, + { + filter = 'el_dirty_water', + base_area = 1, + height = 2, + base_level = 1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {type = "output", position = {0, 4}}, + }, + production_type = "output" + }, + }, + --animation + animation = { + north = { + filename = sprite('entity_animation.png'), + size = {512,512}, + scale = 0.54, + line_length = 3, + frame_count = 3, + animation_speed = 0.2, + shift = {0,-0.1} + }, + east = { + filename = sprite('entity_animation.png'), + size = {512,512}, + scale = 0.54, + line_length = 3, + frame_count = 3, + animation_speed = 0.2, + shift = {0,-0.1} + }, + south = { + filename = sprite('entity_animation.png'), + size = {512,512}, + scale = 0.54, + line_length = 3, + frame_count = 3, + animation_speed = 0.2, + shift = {0,-0.1} + }, + west = { + filename = sprite('entity_animation.png'), + size = {512,512}, + scale = 0.54, + line_length = 3, + frame_count = 3, + animation_speed = 0.2, + shift = {0,-0.1} + }, + }, + working_sound = + { + sound = {filename = "__base__/sound/chemical-plant-3.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/fi_recipes.lua b/prototypes/fi_recipes.lua index c0f55a3..cd5988d 100644 --- a/prototypes/fi_recipes.lua +++ b/prototypes/fi_recipes.lua @@ -15,7 +15,7 @@ data:extend({ enabled = 'false', ingredients = { {'concrete',30}, - {'fi_compound_material_item',10}, + {'fi_materials_GFK',20}, {'iron-gear-wheel',20}, {'electronic-circuit',15}, {'el_energy_crystal_item',4}, @@ -31,10 +31,10 @@ data:extend({ enabled = 'false', ingredients = { {'concrete',60}, - {'fi_compound_material_item',20}, + {'el_materials_ALK',20}, {'iron-gear-wheel',40}, {'electric-engine-unit',15}, - {'el_energy_crystal_item',2}, + {'el_energy_crystal_item',10}, }, result = 'fi_crusher_item', result_count = 1, @@ -129,11 +129,11 @@ data:extend({ enabled = 'false', ingredients = { {'steel-plate',450}, - {'concrete',800}, - {'fi_compound_material_item',600}, - {'copper-plate',200}, - {'el_energy_crystal_item',40}, - {'advanced-circuit',700}, + {'concrete',400}, + {'fi_materials_GFK',300}, + {'fi_materials_NFK',300}, + {'fi_energy_crystal_item',40}, + {'advanced-circuit',500}, }, result = 'fi_solid_reactor_item', result_count = 1, @@ -160,8 +160,8 @@ data:extend({ category = 'fi_crafting_category', subgroup = 'fi_item_subgroup_b', ingredients = { - {'el_aluminum_item',8}, - {'steel-plate',4}, + {'fi_materials_glass_fiber',3}, + {'el_materials_ALK',3}, {'copper-plate',30}, }, result = 'low-density-structure', @@ -282,7 +282,7 @@ data:extend({ {'fi_pure_fuel_item',1}, }, result = 'fi_equipment_player_reactor_item', - result_count = 2, + result_count = 4, energy_required = 20, }, { @@ -310,7 +310,7 @@ data:extend({ {'fi_pure_fuel_item',1}, }, result = 'fi_train_equipment_generator_item', - result_count = 2, + result_count = 4, energy_required = 20, }, --crystals @@ -318,12 +318,13 @@ data:extend({ name = 'fi_energy_crystal_recipe', type = 'recipe', enabled = 'false', - category = 'smelting', + category = 'el_grower_category', ingredients = { - {'fi_base_crystal_item',2}, + {type="item", name="el_energy_crystal_item", amount=1}, + {type="fluid", name="fi_crystal_fluid", amount=50}, }, result = 'fi_energy_crystal_item', - result_count = 1, + result_count = 2, energy_required = 4, always_show_made_in = true, }, @@ -359,10 +360,10 @@ data:extend({ enabled = 'false', category = 'fi_crushing', ingredients = { - {'el_energy_crystal_item',4}, + {'el_energy_crystal_item',1}, }, result = 'fi_crushed_crystal_item', - result_count = 1, + result_count = 2, energy_required = 2, always_show_made_in = true, }, @@ -373,13 +374,13 @@ data:extend({ category = 'chemistry', main_product = 'fi_crystal_fluid', ingredients = { - {type="item", name="fi_crushed_crystal_item", amount=2}, + {type="item", name="fi_crushed_crystal_item", amount=1}, {type="item", name="fi_crushed_lithium_item", amount=1}, }, results = { {type="fluid", name="fi_crystal_fluid", amount=100}, }, - energy_required = 4, + energy_required = 1, always_show_made_in = true, }, { @@ -402,10 +403,10 @@ data:extend({ enabled = 'false', category = 'fi_crushing', ingredients = { - {'el_lithium_item',4}, + {'el_lithium_item',1}, }, result = 'fi_crushed_lithium_item', - result_count = 1, + result_count = 2, energy_required = 2, always_show_made_in = true, }, @@ -415,10 +416,10 @@ data:extend({ enabled = 'false', category = 'fi_crushing', ingredients = { - {'iron-plate',4}, + {'iron-plate',1}, }, result = 'fi_crushed_iron_item', - result_count = 1, + result_count = 2, energy_required = 2, always_show_made_in = true, }, @@ -428,10 +429,10 @@ data:extend({ enabled = 'false', category = 'fi_crushing', ingredients = { - {'copper-plate',4}, + {'copper-plate',1}, }, result = 'fi_crushed_copper_item', - result_count = 1, + result_count = 2, energy_required = 2, always_show_made_in = true, }, @@ -441,10 +442,10 @@ data:extend({ enabled = 'false', category = 'fi_crushing', ingredients = { - {'el_aluminum_item',4}, + {'el_aluminum_item',1}, }, result = 'fi_crushed_aluminum_item', - result_count = 1, + result_count = 2, energy_required = 2, always_show_made_in = true, }, @@ -454,10 +455,36 @@ data:extend({ enabled = 'false', category = 'fi_crushing', ingredients = { - {'coal',4}, + {'coal',1}, }, result = 'fi_crushed_coal_item', - result_count = 1, + result_count = 2, + energy_required = 2, + always_show_made_in = true, + }, + { + name = 'fi_crushed_stone_recipe', + type = 'recipe', + enabled = 'false', + category = 'fi_crushing', + ingredients = { + {'stone',1}, + }, + result = 'fi_crushed_stone_item', + result_count = 2, + energy_required = 2, + always_show_made_in = true, + }, + { + name = 'fi_crushed_uranium_recipe', + type = 'recipe', + enabled = 'false', + category = 'fi_crushing', + ingredients = { + {'uranium-238',1}, + }, + result = 'fi_crushed_uranium_item', + result_count = 2, energy_required = 2, always_show_made_in = true, }, @@ -510,9 +537,9 @@ data:extend({ enabled = 'false', ingredients = { {'fi_robo_charger_item',1}, - {'fi_industrial_steel_item',80}, - {'fi_energy_crystal_item',25}, - {'fi_compound_material_item',80}, + {'fi_materials_GFK',40}, + {'fi_materials_titan',10}, + {'fi_materials_NFK',20}, }, result = 'fi_robo_port_item', result_count = 1, @@ -524,7 +551,7 @@ data:extend({ enabled = 'false', ingredients = { {'roboport',1}, - {'fi_industrial_steel_item',60}, + {'el_materials_ALK',60}, {'fi_energy_crystal_item',25}, {'el_energy_crystal_item',25}, }, @@ -551,7 +578,7 @@ data:extend({ enabled = 'false', ingredients = { {'fi_modules_base_item',1}, - {'fi_base_crystal_item',2}, + {'fi_materials_GFK',1}, }, result = 'fi_modules_core_item', result_count = 1, @@ -637,4 +664,371 @@ data:extend({ result_count = 1, energy_required = 6, }, + { + name = 'fi_fiberer_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting', + ingredients = { + {'concrete',60}, + {'el_materials_ALK',20}, + {'iron-gear-wheel',40}, + {'electric-engine-unit',15}, + {'el_energy_crystal_item',10}, + }, + result = 'fi_fiberer_item', + result_count = 1, + energy_required = 4, + }, + { + name = 'fi_natural_fiber_recipe', + type = 'recipe', + enabled = 'false', + category = 'fi_fiberer_category', + main_product = 'fi_materials_natural_fiber', + ingredients = { + {type="item", name="wood", amount=1}, + --{type="fluid", name="steam", amount=240, temperature=165}, + }, + results = { + {type="item", name="fi_materials_natural_fiber", amount=2}, + }, + energy_required = 2, + always_show_made_in = true + }, + { + name = 'fi_glass_fiber_recipe', + type = 'recipe', + enabled = 'false', + category = 'fi_fiberer_category', + main_product = 'fi_materials_glass_fiber', + ingredients = { + {type="item", name="fi_crushed_glass_item", amount=2}, + --{type="fluid", name="steam", amount=240, temperature=165}, + }, + results = { + {type="item", name="fi_materials_glass_fiber", amount=1}, + }, + energy_required = 2, + always_show_made_in = true + }, + { + name = 'fi_arc_glass_recipe', + type = 'recipe', + enabled = 'false', + category = 'el_arc_furnace_category', + ingredients = { + {type="item", name="stone", amount=5}, + }, + results = { + {type="fluid", name="fi_arc_glass", amount=200}, + }, + energy_required = 0.2, + order = 'a-b', + always_show_made_in = true + }, + { + name = 'fi_cast_glass_recipe', + type = 'recipe', + enabled = 'false', + category = 'el_caster_category', + ingredients = { + {type="fluid", name="fi_arc_glass", amount=100}, + }, + results = { + {type="item", name="fi_materials_glass", amount=1}, + }, + energy_required = 0.2, + order = 'a-b', + always_show_made_in = true, + }, + { + name = 'fi_crushed_glass_recipe', + type = 'recipe', + enabled = 'false', + category = 'fi_crushing', + ingredients = { + {'fi_materials_glass',1}, + }, + result = 'fi_crushed_glass_item', + result_count = 2, + energy_required = 1, + always_show_made_in = true, + }, + { + name = 'fi_flourite_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting-with-fluid', + main_product = 'fi_materials_flourite', + ingredients = { + {type="fluid", name="el_dirty_water", amount=100}, + }, + results = { + {type="fluid", name="water", amount=100}, + {type="item", name="fi_materials_flourite", amount=1}, + }, + energy_required = 0.2, + order = 'a-b', + }, + { + name = 'fi_strong_acid_recipe', + type = 'recipe', + enabled = 'false', + category = 'chemistry', + main_product = 'fi_strong_acid', + ingredients = { + {type="fluid", name="water", amount=50}, + {type="fluid", name="sulfuric-acid", amount=50}, + {type="item", name="fi_materials_flourite", amount=1}, + }, + results = { + {type="fluid", name="el_acidic_water", amount=20}, + {type="fluid", name="fi_strong_acid", amount=80}, + }, + energy_required = 0.2, + order = 'a-b', + always_show_made_in = true, + }, + { + name = 'fi_purify_stone_recipe', + type = 'recipe', + enabled = 'false', + category = 'el_purifier_category', + main_product = 'fi_dirty_water', + ingredients = { + {type="fluid", name="fi_strong_acid", amount=100}, + {type="fluid", name="water", amount=50}, + --{type="fluid", name="steam", amount=240, temperature=165}, + {type="item", name="stone", amount=10} + }, + results = { + {type="fluid", name="fi_dirty_water", amount=50}, + {type="item", name="el_energy_crystal_item", amount=3}, + {type="item", name="el_materials_pure_iron", amount=3}, + {type="item", name="el_materials_pure_copper", amount=3}, + }, + energy_required = 2, + always_show_made_in = true + }, + { + name = 'fi_purify_iron_recipe', + type = 'recipe', + enabled = 'false', + category = 'el_purifier_category', + main_product = 'fi_thorium232_item', + ingredients = { + {type="fluid", name="fi_strong_acid", amount=200}, + {type="fluid", name="water", amount=50}, + --{type="fluid", name="steam", amount=240, temperature=165}, + {type="item", name="iron-ore", amount=10} + }, + results = { + {type="fluid", name="fi_dirty_water", amount=50}, + {type="item", name="fi_thorium232_item", amount=2}, + {type="item", name="el_materials_pure_iron", amount=8} + }, + energy_required = 4, + always_show_made_in = true + }, + { + name = 'fi_purify_copper_recipe', + type = 'recipe', + enabled = 'false', + category = 'el_purifier_category', + main_product = 'uranium-238', + ingredients = { + {type="fluid", name="fi_strong_acid", amount=200}, + {type="fluid", name="water", amount=50}, + --{type="fluid", name="steam", amount=240, temperature=165}, + {type="item", name="copper-ore", amount=10} + }, + results = { + {type="fluid", name="fi_dirty_water", amount=50}, + {type="item", name="uranium-238", amount=2}, + {type="item", name="el_materials_pure_copper", amount=8} + }, + energy_required = 2, + always_show_made_in = true + }, + { + name = 'fi_purify_uranium_recipe', + type = 'recipe', + enabled = 'false', + category = 'el_purifier_category', + main_product = 'fi_dirty_water', + ingredients = { + {type="fluid", name="fi_strong_acid", amount=1000}, + {type="fluid", name="water", amount=500}, + --{type="fluid", name="steam", amount=240, temperature=165}, + {type="item", name="uranium-ore", amount=100} + }, + results = { + {type="fluid", name="fi_dirty_water", amount=500}, + {type="item", name="el_energy_crystal_item", amount=50}, + {type="item", name="uranium-238", amount=20}, + {type="item", name="uranium-235", amount=4}, + }, + energy_required = 2, + always_show_made_in = true + }, + + + { + name = 'fi_arc_pure_gold_recipe', + type = 'recipe', + enabled = 'false', + category = 'el_arc_furnace_category', + ingredients = { + {type="item", name="fi_materials_pure_gold", amount=1}, + }, + results = { + {type="fluid", name="fi_arc_gold", amount=200}, + }, + energy_required = 0.2, + order = 'a-b', + always_show_made_in = true + }, + { + name = 'fi_cast_gold_recipe', + type = 'recipe', + enabled = 'false', + category = 'el_caster_category', + ingredients = { + {type="fluid", name="fi_arc_gold", amount=100}, + }, + results = { + {type="item", name="fi_materials_gold", amount=1}, + }, + energy_required = 0.2, + order = 'a-b', + always_show_made_in = true, + }, + { + name = 'fi_arc_pure_titan_recipe', + type = 'recipe', + enabled = 'false', + category = 'el_arc_furnace_category', + ingredients = { + {type="item", name="fi_materials_pure_titan", amount=1}, + }, + results = { + {type="fluid", name="fi_arc_titan", amount=200}, + }, + energy_required = 0.2, + order = 'a-b', + always_show_made_in = true + }, + { + name = 'fi_cast_titan_recipe', + type = 'recipe', + enabled = 'false', + category = 'el_caster_category', + ingredients = { + {type="fluid", name="fi_arc_titan", amount=100}, + }, + results = { + {type="item", name="fi_materials_titan", amount=1}, + }, + energy_required = 0.2, + order = 'a-b', + always_show_made_in = true, + }, + { + name = 'fi_arc_pure_neodym_recipe', + type = 'recipe', + enabled = 'false', + category = 'el_arc_furnace_category', + ingredients = { + {type="item", name="fi_materials_pure_neodym", amount=1}, + }, + results = { + {type="fluid", name="fi_arc_neodym", amount=200}, + }, + energy_required = 0.2, + order = 'a-b', + always_show_made_in = true + }, + { + name = 'fi_cast_neodym_recipe', + type = 'recipe', + enabled = 'false', + category = 'el_caster_category', + ingredients = { + {type="fluid", name="fi_arc_neodym", amount=100}, + }, + results = { + {type="item", name="fi_materials_neodym", amount=1}, + }, + energy_required = 0.2, + order = 'a-b', + always_show_made_in = true, + }, + { + name = 'fi_compound_machine_recipe', + type = 'recipe', + enabled = 'false', + ingredients = { + {'concrete',60}, + {'el_materials_ALK',60}, + {'iron-gear-wheel',40}, + {'electric-engine-unit',15}, + {'el_energy_crystal_item',20}, + }, + result = 'fi_compound_machine_item', + result_count = 1, + energy_required = 4, + }, + { + name = 'fi_NFK_recipe', + type = 'recipe', + enabled = 'false', + category = 'fi_compound_machine_category', + ingredients = { + {type="fluid", name="petroleum-gas", amount=10}, + {type="item", name="fi_materials_natural_fiber", amount=1}, + {type="item", name="plastic-bar", amount=1}, + }, + results = { + {type="item", name="fi_materials_NFK", amount=1}, + }, + energy_required = 0.2, + order = 'a-b', + always_show_made_in = true, + }, + { + name = 'fi_GFK_recipe', + type = 'recipe', + enabled = 'false', + category = 'fi_compound_machine_category', + ingredients = { + {type="fluid", name="petroleum-gas", amount=10}, + {type="item", name="fi_materials_glass_fiber", amount=1}, + {type="item", name="plastic-bar", amount=1}, + }, + results = { + {type="item", name="fi_materials_GFK", amount=1}, + }, + energy_required = 0.2, + order = 'a-b', + always_show_made_in = true, + }, + { + name = 'fi_pure_ore_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting-with-fluid', + main_product = 'fi_materials_pure_gold', + ingredients = { + {type="fluid", name="fi_dirty_water", amount=50}, + }, + results = { + {type="fluid", name="water", amount=50}, + {type="item", name="fi_materials_pure_gold", amount=2}, + {type="item", name="fi_materials_pure_neodym", amount=2}, + {type="item", name="fi_materials_pure_titan", amount=2}, + }, + energy_required = 0.2, + order = 'a-b', + }, }) \ No newline at end of file diff --git a/prototypes/fission/fi_compound_machine.lua b/prototypes/fission/fi_compound_machine.lua new file mode 100644 index 0000000..61643ed --- /dev/null +++ b/prototypes/fission/fi_compound_machine.lua @@ -0,0 +1,177 @@ +--local functions +local function config(name) + return settings.startup['fi_compound_machine_'..name].value +end + +local function sprite(name) + return '__248k__/ressources/fission/fi_compound_machine/fi_compound_machine_'..name +end + +--item +data:extend({ + { + name = 'fi_compound_machine_item', + type = 'item', + icon = sprite('icon.png'), + icon_size = 64, + place_result = 'fi_compound_machine_entity', + stack_size = 20, + subgroup = 'fi_item_subgroup_c', + order = 'a-b', + }, + +}) + +--entity +data:extend({ + --prototype + { + name = 'fi_compound_machine_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 = 'fi_compound_machine_item', + }, + crafting_categories = {'fi_compound_machine_category'}, + crafting_speed = 1, + --fixed_recipe = 'el_water_pressure_recipe', + energy_source = { + type = 'electric', + usage_priority = 'secondary-input', + }, + allowed_effects = {"speed", "consumption", "productivity", "pollution"}, + module_specification = { + module_info_icon_shift = { + 0, + 0.8 + }, + module_slots = 2 + }, + energy_usage = '400kW', + fluid_boxes = { + { + + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {type = "input", position = {0, -4}}, + }, + production_type = "input" + }, + { + + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {type = "input", position = {-4, 0}} + }, + production_type = "input" + }, + { + + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + 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_connections = + { + {type = "input", position = {0, 4}}, + }, + production_type = "input" + }, + }, + --animation + animation = { + north = { + filename = sprite('entity_animation.png'), + size = {512,512}, + scale = 0.54, + line_length = 3, + frame_count = 3, + animation_speed = 0.5, + shift = {0,-0.1} + }, + east = { + filename = sprite('entity_animation.png'), + size = {512,512}, + scale = 0.54, + line_length = 3, + --lines_per_file = 3, + frame_count = 3, + animation_speed = 0.5, + shift = {0,-0.1} + }, + south = { + filename = sprite('entity_animation.png'), + size = {512,512}, + scale = 0.54, + line_length = 3, + frame_count = 3, + animation_speed = 0.5, + shift = {0,-0.1} + }, + west = { + filename = sprite('entity_animation.png'), + size = {512,512}, + scale = 0.54, + line_length = 3, + frame_count = 3, + animation_speed = 0.5, + shift = {0,-0.1} + }, + }, + working_sound = + { + sound = {filename = "__base__/sound/chemical-plant-3.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/fission/fi_crushed.lua b/prototypes/fission/fi_crushed.lua index 95c3274..888644e 100644 --- a/prototypes/fission/fi_crushed.lua +++ b/prototypes/fission/fi_crushed.lua @@ -54,4 +54,31 @@ data:extend({ subgroup = 'fi_item_subgroup_a-b', order = 'a-f', }, + { + name = 'fi_crushed_glass_item', + type = 'item', + icon = sprite('glass_item.png'), + icon_size = 64, + stack_size = 100, + subgroup = 'fi_item_subgroup_a-b', + order = 'a-f', + }, + { + name = 'fi_crushed_stone_item', + type = 'item', + icon = sprite('stone_item.png'), + icon_size = 64, + stack_size = 100, + subgroup = 'fi_item_subgroup_a-b', + order = 'a-f', + }, + { + name = 'fi_crushed_uranium_item', + type = 'item', + icon = sprite('uranium_item.png'), + icon_size = 64, + stack_size = 100, + subgroup = 'fi_item_subgroup_a-b', + order = 'a-f', + }, }) \ No newline at end of file diff --git a/prototypes/fission/fi_fiberer.lua b/prototypes/fission/fi_fiberer.lua new file mode 100644 index 0000000..0d88615 --- /dev/null +++ b/prototypes/fission/fi_fiberer.lua @@ -0,0 +1,105 @@ +--local functions +local function config(name) + return settings.startup['fi_fiberer_'..name].value +end + +local function sprite(name) + return '__248k__/ressources/fission/fi_fiberer/fi_fiberer_'..name +end + +--item +data:extend({ + { + name = 'fi_fiberer_item', + type = 'item', + icon = sprite('icon.png'), + icon_size = 64, + place_result = 'fi_fiberer_entity', + stack_size = 20, + subgroup = 'fi_item_subgroup_c', + order = 'a-a', + }, + +}) + +--entity +data:extend({ + --prototype + { + name = 'fi_fiberer_entity', + type = 'assembling-machine', + icon = sprite('icon.png'), + icon_size = 64, + flags = {"player-creation","placeable-neutral"}, + max_health = 300, + corpse = 'big-remnants', + collision_box = {{-1.4,-1.4},{1.4,1.4}}, + selection_box = {{-1.5,-1.5},{1.5,1.5}}, + map_color = {r=0, g=0, b=1, a=1}, + minable = { + mining_time = 1, + result = 'fi_fiberer_item', + }, + crafting_categories = {'fi_fiberer_category'}, + crafting_speed = 3.5, + energy_source = { + type = 'electric', + usage_priority = 'secondary-input', + --input_flow_limit = '4MW', + }, + energy_usage = '1MW', + allowed_effects = {"speed", "productivity", "consumption", "pollution"}, + module_specification = { + module_info_icon_shift = { + 0, + 0.8 + }, + module_slots = 2 + }, + --animation + animation = { + north = { + filename = sprite('entity_animation.png'), + size = {480,448}, + scale = 0.2, + line_length = 3, + lines_per_file = 3, + frame_count = 4, + animation_speed = 0.5, + }, + east = { + filename = sprite('entity_animation.png'), + size = {480,448}, + scale = 0.2, + line_length = 3, + lines_per_file = 3, + frame_count = 4, + animation_speed = 0.5, + }, + south = { + filename = sprite('entity_animation.png'), + size = {480,448}, + scale = 0.2, + line_length = 3, + lines_per_file = 3, + frame_count = 4, + animation_speed = 0.5, + }, + west = { + filename = sprite('entity_animation.png'), + size = {480,448}, + scale = 0.2, + line_length = 3, + lines_per_file = 3, + frame_count = 4, + animation_speed = 0.5, + }, + }, + + working_sound = { + sound = { filename = '__base__/sound/nuclear-reactor-1.ogg'}, + idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, + apparent_volume = 0.7, + }, + }, +}) \ No newline at end of file diff --git a/prototypes/fission/fi_materials.lua b/prototypes/fission/fi_materials.lua index 9a07b28..dd8b374 100644 --- a/prototypes/fission/fi_materials.lua +++ b/prototypes/fission/fi_materials.lua @@ -27,6 +27,113 @@ data:extend({ subgroup = 'fi_item_subgroup_a-c', order = 'a-a', }, - + { + name = 'fi_materials_natural_fiber', + type = 'item', + icon = sprite('natural_fiber.png'), + icon_size = 64, + stack_size = 100, + subgroup = 'fi_item_subgroup_a-c', + order = 'a-a', + }, + { + name = 'fi_materials_glass_fiber', + type = 'item', + icon = sprite('glass_fiber.png'), + icon_size = 64, + stack_size = 100, + subgroup = 'fi_item_subgroup_a-c', + order = 'a-a', + }, + { + name = 'fi_materials_glass', + type = 'item', + icon = sprite('glass.png'), + icon_size = 64, + stack_size = 100, + subgroup = 'fi_item_subgroup_a-c', + order = 'a-a', + }, + { + name = 'fi_materials_flourite', + type = 'item', + icon = sprite('flourite.png'), + icon_size = 64, + stack_size = 50, + subgroup = 'fi_item_subgroup_a-c', + order = 'a-a', + }, + { + name = 'fi_materials_pure_gold', + type = 'item', + icon = sprite('pure_gold.png'), + icon_size = 64, + stack_size = 50, + subgroup = 'fi_item_subgroup_a-c', + order = 'a-a', + }, + { + name = 'fi_materials_pure_titan', + type = 'item', + icon = sprite('pure_titan.png'), + icon_size = 64, + stack_size = 50, + subgroup = 'fi_item_subgroup_a-c', + order = 'a-a', + }, + { + name = 'fi_materials_pure_neodym', + type = 'item', + icon = sprite('pure_neodym.png'), + icon_size = 64, + stack_size = 50, + subgroup = 'fi_item_subgroup_a-c', + order = 'a-a', + }, + { + name = 'fi_materials_gold', + type = 'item', + icon = sprite('gold.png'), + icon_size = 64, + stack_size = 50, + subgroup = 'fi_item_subgroup_a-c', + order = 'a-a', + }, + { + name = 'fi_materials_neodym', + type = 'item', + icon = sprite('neodym.png'), + icon_size = 64, + stack_size = 50, + subgroup = 'fi_item_subgroup_a-c', + order = 'a-a', + }, + { + name = 'fi_materials_titan', + type = 'item', + icon = sprite('titan.png'), + icon_size = 64, + stack_size = 50, + subgroup = 'fi_item_subgroup_a-c', + order = 'a-a', + }, + { + name = 'fi_materials_NFK', + type = 'item', + icon = sprite('NFK.png'), + icon_size = 64, + stack_size = 50, + subgroup = 'fi_item_subgroup_b', + order = 'a-a', + }, + { + name = 'fi_materials_GFK', + type = 'item', + icon = sprite('GFK.png'), + icon_size = 64, + stack_size = 50, + subgroup = 'fi_item_subgroup_b', + order = 'a-a', + }, }) diff --git a/prototypes/fission/fi_modules.lua b/prototypes/fission/fi_modules.lua index 36a5ac8..5345f00 100644 --- a/prototypes/fission/fi_modules.lua +++ b/prototypes/fission/fi_modules.lua @@ -8,18 +8,16 @@ local function sprite(name) end local limitation_list = { - 'el_aluminum_ore_recipe', - 'el_aluminum_item_recipe', - 'el_lithium_ore_recipe', - 'el_lithium_item_recipe', 'el_train_fuel_diesel_recipe', - 'el_energy_crystal_recipe', + 'el_grow_energy_crystal_recipe', 'fi_compound_material_recipe', 'fi_materials_industrial_steel_recipe', 'fu_lead_ore_recipe', 'fi_base_crystal_recipe', 'fi_catalyst_crystal_recipe', - 'fi_energy_crystal_recipe' + 'fi_energy_crystal_recipe', + 'fi_glass_fiber_recipe', + 'fi_natural_fiber_recipe' } --item diff --git a/prototypes/fu_recipes.lua b/prototypes/fu_recipes.lua index 89984e0..6a4fe0e 100644 --- a/prototypes/fu_recipes.lua +++ b/prototypes/fu_recipes.lua @@ -89,7 +89,7 @@ data:extend({ }, --tech sign { - name = 'fu_tech_sign_1_recipe', + name = 'fu_fusion_card_1_recipe', type = 'recipe', category = 'fu_fusor_crafting_category', enabled = 'false', @@ -97,13 +97,13 @@ data:extend({ {type="fluid", name="fu_lithium_6", amount=100}, {type="fluid", name="fu_protium", amount=100}, }, - result = 'fu_tech_sign_item', + result = 'fu_materials_fusion_card', result_count = 5, energy_required = 100, always_show_made_in = true, }, { - name = 'fu_tech_sign_2_recipe', + name = 'fu_fusion_card_2_recipe', type = 'recipe', category = 'fu_fusor_crafting_category', enabled = 'false', @@ -111,13 +111,13 @@ data:extend({ {type="fluid", name="fu_lithium_6", amount=100}, {type="fluid", name="fu_deuterium", amount=100}, }, - result = 'fu_tech_sign_item', - result_count = 100, + result = 'fu_materials_fusion_card', + result_count = 30, energy_required = 100, always_show_made_in = true, }, { - name = 'fu_tech_sign_3_recipe', + name = 'fu_fusion_card_3_recipe', type = 'recipe', category = 'fu_fusor_crafting_category', enabled = 'false', @@ -125,13 +125,13 @@ data:extend({ {type="fluid", name="fu_lithium_6", amount=100}, {type="fluid", name="fu_helium_3", amount=100}, }, - result = 'fu_tech_sign_item', + result = 'fu_materials_fusion_card', result_count = 100, energy_required = 100, always_show_made_in = true, }, { - name = 'fu_tech_sign_4_recipe', + name = 'fu_fusion_card_4_recipe', type = 'recipe', category = 'fu_fusor_crafting_category', enabled = 'false', @@ -139,26 +139,26 @@ data:extend({ {type="fluid", name="fu_deuterium", amount=100}, {type="fluid", name="fu_tritium", amount=100}, }, - result = 'fu_tech_sign_item', - result_count = 10000, + result = 'fu_materials_fusion_card', + result_count = 100, energy_required = 100, always_show_made_in = true, }, { - name = 'fu_tech_sign_5_recipe', + name = 'fu_fusion_card_5_recipe', type = 'recipe', category = 'fu_fusor_crafting_category', enabled = 'false', ingredients = { - {type="fluid", name="fu_deuterium", amount=200}, + {type="fluid", name="fu_deuterium", amount=100}, }, - result = 'fu_tech_sign_item', - result_count = 2000, + result = 'fu_materials_fusion_card', + result_count = 40, energy_required = 100, always_show_made_in = true, }, { - name = 'fu_tech_sign_6_recipe', + name = 'fu_fusion_card_6_recipe', type = 'recipe', category = 'fu_fusor_crafting_category', enabled = 'false', @@ -166,21 +166,21 @@ data:extend({ {type="fluid", name="fu_deuterium", amount=100}, {type="fluid", name="fu_helium_3", amount=100}, }, - result = 'fu_tech_sign_item', - result_count = 1000, + result = 'fu_materials_fusion_card', + result_count = 20, energy_required = 100, always_show_made_in = true, }, { - name = 'fu_tech_sign_7_recipe', + name = 'fu_fusion_card_7_recipe', type = 'recipe', category = 'fu_fusor_crafting_category', enabled = 'false', ingredients = { {type="fluid", name="fu_protium", amount=20000}, }, - result = 'fu_tech_sign_item', - result_count = 10, + result = 'fu_materials_fusion_card', + result_count = 1, energy_required = 100, always_show_made_in = true, }, @@ -296,14 +296,17 @@ data:extend({ { name = 'fu_lead_recipe', type = 'recipe', - category = 'smelting', enabled = 'false', + category = 'el_caster_category', ingredients = { - {type="item", name="fu_lead_ore_item", amount=4}, + {type="fluid", name="fu_arc_pure_lead", amount=100}, }, - result = 'fu_lead_item', - result_count = 2, - energy_required = 2, + results = { + {type="item", name="fu_lead_item", amount=1}, + }, + energy_required = 0.2, + order = 'a-b', + always_show_made_in = true, }, { name = 'fu_lead_crushed_recipe', @@ -311,10 +314,10 @@ data:extend({ category = 'fi_crushing', enabled = 'false', ingredients = { - {type="item", name="fu_lead_item", amount=4}, + {type="item", name="fu_lead_item", amount=1}, }, result = 'fu_crushed_lead_item', - result_count = 1, + result_count = 2, energy_required = 2, }, { @@ -338,7 +341,7 @@ data:extend({ category = 'fu_stelar_reactor_crafting_category', enabled = 'false', ingredients = { - {type="fluid", name="fu_lead_fluid", amount=1000, temperature=500}, + {type="fluid", name="fu_lead_fluid", amount=1000}, {type="fluid", name="fu_protium", amount=20}, }, results = { @@ -353,7 +356,7 @@ data:extend({ category = 'fu_stelar_reactor_crafting_category', enabled = 'false', ingredients = { - {type="fluid", name="fu_lead_fluid", amount=1000, temperature=500}, + {type="fluid", name="fu_lead_fluid", amount=1000}, {type="fluid", name="fu_deuterium", amount=1}, {type="fluid", name="fu_tritium", amount=1}, }, @@ -369,7 +372,7 @@ data:extend({ category = 'fu_stelar_reactor_crafting_category', enabled = 'false', ingredients = { - {type="fluid", name="fu_lead_fluid", amount=1000, temperature=500}, + {type="fluid", name="fu_lead_fluid", amount=1000}, {type="fluid", name="fu_protium", amount=15}, {type="fluid", name="fu_lithium_6", amount=15}, }, @@ -386,7 +389,7 @@ data:extend({ category = 'fu_tokamak_reactor_crafting_category', enabled = 'false', ingredients = { - {type="fluid", name="fu_lead_fluid", amount=110000, temperature=500}, + {type="fluid", name="fu_lead_fluid", amount=110000}, {type="fluid", name="fu_deuterium", amount=200}, }, results = { @@ -401,7 +404,7 @@ data:extend({ category = 'fu_tokamak_reactor_crafting_category', enabled = 'false', ingredients = { - {type="fluid", name="fu_lead_fluid", amount=180000, temperature=500}, + {type="fluid", name="fu_lead_fluid", amount=180000}, {type="fluid", name="fu_deuterium", amount=100}, {type="fluid", name="fu_tritium", amount=100}, }, @@ -1084,5 +1087,275 @@ data:extend({ result_count = 1, energy_required = 6, }, + { + name = 'fu_laser_recipe', + type = 'recipe', + enabled = 'false', + ingredients = { + {'concrete',60}, + {'el_materials_ALK',60}, + {'iron-gear-wheel',40}, + {'electric-engine-unit',15}, + {'el_energy_crystal_item',20}, + }, + result = 'fu_laser_item', + result_count = 1, + energy_required = 4, + }, + { + name = 'fu_laser_crystal_recipe', + type = 'recipe', + category = 'fu_laser_category', + enabled = 'false', + main_product = 'fu_materials_energy_crystal', + subgroup = 'fu_item_subgroup_a-b', + ingredients = { + {type="fluid", name="fu_lead_fluid", amount=50}, + {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", amount=50, temperature=1500} + }, + result_count = 1, + energy_required = 3, + always_show_made_in = true, + }, + { + name = 'fu_refined_crystal_recipe', + type = 'recipe', + category = 'el_grower_category', + enabled = 'false', + subgroup = 'fu_item_subgroup_a-b', + ingredients = { + {type="fluid", name="fi_crystal_fluid", amount=100}, + {type="item", name="fi_energy_crystal_item", amount=2} + }, + results = { + {type="item", name="fu_materials_refined_crystal", amount=1} + }, + result_count = 1, + energy_required = 10, + always_show_made_in = true, + }, + { + name = 'fu_plasma_recipe', + type = 'recipe', + enabled = 'false', + ingredients = { + {'concrete',60}, + {'el_materials_ALK',60}, + {'iron-gear-wheel',40}, + {'electric-engine-unit',15}, + {'el_energy_crystal_item',20}, + }, + result = 'fu_plasma_item', + result_count = 1, + energy_required = 4, + }, + { + name = 'fu_magnet_recipe', + type = 'recipe', + enabled = 'false', + ingredients = { + {'concrete',60}, + {'el_materials_ALK',60}, + {'iron-gear-wheel',40}, + {'electric-engine-unit',15}, + {'el_energy_crystal_item',20}, + }, + result = 'fu_magnet_item', + result_count = 1, + energy_required = 4, + }, + { + name = 'fu_magnet_1_recipe', + type = 'recipe', + enabled = 'false', + category = 'fu_magnet_category', + main_product = 'fu_materials_magnet', + ingredients = { + {type="fluid", name="fu_lead_fluid", amount=20}, + {type="item", name="fi_materials_neodym", amount=6}, + {type="item", name="fi_materials_GFK", amount=2}, + }, + results = { + {type="fluid", name="fu_lead_fluid", amount=20, temperature=1500}, + {type="item", name="fu_materials_magnet", amount=1}, + }, + energy_required = 4, + always_show_made_in = true, + }, + { + name = 'fu_KFK_recipe', + type = 'recipe', + enabled = 'false', + category = 'fi_compound_machine_category', + ingredients = { + {type="fluid", name="petroleum-gas", amount=20}, + {type="item", name="fu_materials_carbon_fiber", amount=1}, + {type="item", name="plastic-bar", amount=2}, + }, + results = { + {type="item", name="fu_materials_KFK", amount=1}, + }, + energy_required = 0.2, + order = 'a-b', + always_show_made_in = true, + }, + { + name = 'fu_TIM_recipe', + type = 'recipe', + enabled = 'false', + category = 'fi_compound_machine_category', + ingredients = { + {type="fluid", name="fu_metal_foam", amount=20}, + {type="item", name="fi_materials_titan", amount=4}, + }, + results = { + {type="item", name="fu_materials_TIM", amount=1}, + }, + energy_required = 0.2, + order = 'a-b', + always_show_made_in = true, + }, + { + name = 'fu_metal_foam_recipe', + type = 'recipe', + enabled = 'false', + category = 'chemistry', + ingredients = { + {type="fluid", name="steam", amount=300}, + {type="item", name="el_aluminum_item", amount=4}, + }, + results = { + {type="fluid", name="fu_metal_foam", amount=20}, + }, + energy_required = 0.2, + order = 'a-b', + always_show_made_in = true, + }, + { + name = 'fu_carbon_fiber_recipe', + type = 'recipe', + enabled = 'false', + category = 'fi_fiberer_category', + ingredients = { + {type="item", name="fi_crushed_coal_item", amount=6}, + --{type="fluid", name="steam", amount=240, temperature=165}, + }, + results = { + {type="item", name="fu_materials_carbon_fiber", amount=1}, + }, + energy_required = 2, + always_show_made_in = true + }, + + + + { + name = 'fu_laser_card_recipe', + type = 'recipe', + enabled = 'false', + category = 'fu_laser_category', + main_product = 'fu_materials_laser_card', + ingredients = { + {type="fluid", name="fu_lead_fluid", amount=50} + }, + results = { + {type="fluid", name="fu_lead_fluid", amount=50, temperature=1500}, + {type="item", name="fu_materials_laser_card", amount=1} + }, + energy_required = 1, + always_show_made_in = true + }, + { + name = 'fu_plasma_card_recipe', + type = 'recipe', + enabled = 'false', + category = 'fu_plasma_category', + main_product = 'fu_materials_plasma_card', + ingredients = { + {type="fluid", name="fu_lead_fluid", amount=50}, + {type="item", name="stone", amount=10} + }, + results = { + {type="fluid", name="fu_lead_fluid", amount=50, temperature=1500}, + {type="item", name="fu_materials_plasma_card", amount=1} + }, + energy_required = 1, + always_show_made_in = true + }, + { + name = 'fu_magnet_card_recipe', + type = 'recipe', + enabled = 'false', + category = 'fu_magnet_category', + main_product = 'fu_materials_magnet_card', + ingredients = { + {type="fluid", name="fu_lead_fluid", amount=50}, + {type="item", name="fi_materials_neodym", amount=1} + }, + results = { + {type="fluid", name="fu_lead_fluid", amount=50, temperature=1500}, + {type="item", name="fu_materials_magnet_card", amount=1} + }, + energy_required = 1, + always_show_made_in = true + }, + + { + name = 'fu_pure_ore_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting-with-fluid', + main_product = 'fu_materials_pure_lead', + ingredients = { + {type="fluid", name="fi_dirty_water", amount=50}, + }, + results = { + {type="fluid", name="water", amount=50}, + {type="item", name="fi_materials_pure_gold", amount=2}, + {type="item", name="fi_materials_pure_neodym", amount=2}, + {type="item", name="fi_materials_pure_titan", amount=2}, + {type="item", name="fu_materials_pure_lead", amount=2}, + }, + energy_required = 0.2, + order = 'a-b', + }, + { + name = 'fu_arc_pure_lead_recipe', + type = 'recipe', + enabled = 'false', + category = 'el_arc_furnace_category', + ingredients = { + {type="item", name="fu_materials_pure_lead", amount=1}, + }, + results = { + {type="fluid", name="fu_arc_pure_lead", amount=200}, + }, + energy_required = 0.2, + order = 'a-b', + always_show_made_in = true + }, + { + name = 'fu_tech_sign_recipe', + type = 'recipe', + enabled = 'false', + main_product = 'fu_tech_sign_item', + ingredients = { + {type="item", name="fu_materials_laser_card", amount=1}, + {type="item", name="fu_materials_plasma_card", amount=1}, + {type="item", name="fu_materials_fusion_card", amount=1}, + {type="item", name="fu_materials_magnet_card", amount=1}, + }, + results = { + {type="item", name="fu_tech_sign_item", amount=2} + }, + energy_required = 1, + order = 'a-b', + }, + + }) \ No newline at end of file diff --git a/prototypes/fusion/fu_laser.lua b/prototypes/fusion/fu_laser.lua new file mode 100644 index 0000000..fdd7545 --- /dev/null +++ b/prototypes/fusion/fu_laser.lua @@ -0,0 +1,169 @@ +--local functions +local function config(name) + return settings.startup['fu_laser_'..name].value +end + +local function sprite(name) + return '__248k__/ressources/fusion/fu_laser/fu_laser_'..name +end + +--item +data:extend({ + { + name = 'fu_laser_item', + type = 'item', + icon = sprite('icon.png'), + icon_size = 64, + place_result = 'fu_laser_entity', + stack_size = 20, + subgroup = 'fu_item_subgroup_c', + order = 'a-b', + }, + +}) + +--entity +data:extend({ + --prototype + { + name = 'fu_laser_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_laser_item', + }, + crafting_categories = {'fu_laser_category'}, + crafting_speed = 1, + ingredient_count = 2, + --fixed_recipe = 'el_water_pressure_recipe', + energy_source = { + type = 'electric', + usage_priority = 'secondary-input', + }, + energy_usage = '60MW', + fluid_boxes = { + { + + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {type = "input", position = {0, -4}}, + }, + production_type = "input" + }, + { + + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {type = "input", position = {-4, 0}} + }, + production_type = "input" + }, + { + + base_area = 1, + height = 2, + base_level = 1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {type = "output", position = {4, 0}}, + --{type = "output", position = {2, -2.5}} + }, + production_type = "output" + }, + { + + base_area = 1, + height = 2, + base_level = 1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {type = "output", position = {0, 4}}, + }, + production_type = "output" + }, + }, + --animation + animation = { + north = { + filename = sprite('entity_animation.png'), + size = {512,512}, + scale = 0.54, + line_length = 3, + frame_count = 3, + animation_speed = 0.2, + shift = {0,-0.1} + }, + east = { + filename = sprite('entity_animation.png'), + size = {512,512}, + scale = 0.54, + line_length = 3, + frame_count = 3, + animation_speed = 0.2, + shift = {0,-0.1} + }, + south = { + filename = sprite('entity_animation.png'), + size = {512,512}, + scale = 0.54, + line_length = 3, + frame_count = 3, + animation_speed = 0.2, + shift = {0,-0.1} + }, + west = { + filename = sprite('entity_animation.png'), + size = {512,512}, + scale = 0.54, + line_length = 3, + frame_count = 3, + animation_speed = 0.2, + shift = {0,-0.1} + }, + }, + working_sound = + { + sound = {filename = "__base__/sound/chemical-plant-3.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_magnet.lua b/prototypes/fusion/fu_magnet.lua new file mode 100644 index 0000000..5e51d8f --- /dev/null +++ b/prototypes/fusion/fu_magnet.lua @@ -0,0 +1,173 @@ +--local functions +local function config(name) + return settings.startup['fu_magnet_'..name].value +end + +local function sprite(name) + return '__248k__/ressources/fusion/fu_magnet/fu_magnet_'..name +end + +--item +data:extend({ + { + name = 'fu_magnet_item', + type = 'item', + icon = sprite('icon.png'), + icon_size = 64, + place_result = 'fu_magnet_entity', + stack_size = 20, + subgroup = 'fu_item_subgroup_c', + order = 'a-b', + }, + +}) + +--entity +data:extend({ + --prototype + { + name = 'fu_magnet_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_magnet_item', + }, + crafting_categories = {'fu_magnet_category'}, + crafting_speed = 1, + ingredient_count = 2, + --fixed_recipe = 'el_water_pressure_recipe', + energy_source = { + type = 'electric', + usage_priority = 'secondary-input', + }, + energy_usage = '20MW', + fluid_boxes = { + { + + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {type = "input", position = {0, -4}}, + }, + production_type = "input" + }, + { + + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {type = "input", position = {-4, 0}} + }, + production_type = "input" + }, + { + + base_area = 1, + height = 2, + base_level = 1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {type = "output", position = {4, 0}}, + --{type = "output", position = {2, -2.5}} + }, + production_type = "output" + }, + { + + base_area = 1, + height = 2, + base_level = 1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {type = "output", position = {0, 4}}, + }, + production_type = "output" + }, + }, + --animation + animation = { + north = { + filename = sprite('entity_animation.png'), + size = {512,512}, + scale = 0.54, + line_length = 3, + lines_per_file = 3, + frame_count = 9, + animation_speed = 0.2, + shift = {0,-0.1} + }, + east = { + filename = sprite('entity_animation.png'), + size = {512,512}, + scale = 0.54, + line_length = 3, + lines_per_file = 3, + frame_count = 9, + animation_speed = 0.2, + shift = {0,-0.1} + }, + south = { + filename = sprite('entity_animation.png'), + size = {512,512}, + scale = 0.54, + line_length = 3, + lines_per_file = 3, + frame_count = 9, + animation_speed = 0.2, + shift = {0,-0.1} + }, + west = { + filename = sprite('entity_animation.png'), + size = {512,512}, + scale = 0.54, + line_length = 3, + lines_per_file = 3, + frame_count = 9, + animation_speed = 0.2, + shift = {0,-0.1} + }, + }, + working_sound = + { + sound = {filename = "__base__/sound/chemical-plant-3.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 new file mode 100644 index 0000000..abd1f96 --- /dev/null +++ b/prototypes/fusion/fu_materials.lua @@ -0,0 +1,111 @@ +--local functions +local function config(name) + return settings.startup['fu_materials_'..name].value +end + +local function sprite(name) + return '__248k__/ressources/fusion/fu_materials/fu_materials_'..name +end + +--item +data:extend({ + { + name = 'fu_materials_energy_crystal', + type = 'item', + icon = sprite('energy_crystal.png'), + icon_size = 64, + stack_size = 100, + subgroup = 'fu_item_subgroup_a', + order = 'a-a', + }, + { + name = 'fu_materials_refined_crystal', + type = 'item', + icon = sprite('refined_crystal.png'), + icon_size = 64, + stack_size = 100, + subgroup = 'fu_item_subgroup_a', + order = 'a-a', + }, + { + name = 'fu_materials_pure_lead', + type = 'item', + icon = sprite('pure_lead.png'), + icon_size = 64, + stack_size = 100, + subgroup = 'fu_item_subgroup_a', + order = 'a-a', + }, + { + name = 'fu_materials_KFK', + type = 'item', + icon = sprite('KFK.png'), + icon_size = 64, + stack_size = 100, + subgroup = 'fu_item_subgroup_b', + order = 'a-a', + }, + { + name = 'fu_materials_TIM', + type = 'item', + icon = sprite('TIM.png'), + icon_size = 64, + stack_size = 100, + subgroup = 'fu_item_subgroup_b', + order = 'a-a', + }, + { + name = 'fu_materials_magnet', + type = 'item', + icon = sprite('magnet.png'), + icon_size = 64, + stack_size = 100, + subgroup = 'fu_item_subgroup_b', + order = 'a-a', + }, + { + name = 'fu_materials_carbon_fiber', + type = 'item', + icon = sprite('carbon_fiber.png'), + icon_size = 64, + stack_size = 100, + subgroup = 'fu_item_subgroup_b', + order = 'a-a', + }, + { + name = 'fu_materials_plasma_card', + type = 'item', + icon = sprite('plasma_card.png'), + icon_size = 64, + stack_size = 100, + subgroup = 'fu_item_subgroup_c', + order = 'c-a', + }, + { + name = 'fu_materials_laser_card', + type = 'item', + icon = sprite('laser_card.png'), + icon_size = 64, + stack_size = 100, + subgroup = 'fu_item_subgroup_c', + order = 'c-a', + }, + { + name = 'fu_materials_magnet_card', + type = 'item', + icon = sprite('magnet_card.png'), + icon_size = 64, + stack_size = 100, + subgroup = 'fu_item_subgroup_c', + order = 'c-a', + }, + { + name = 'fu_materials_fusion_card', + type = 'item', + icon = sprite('fusion_card.png'), + icon_size = 64, + stack_size = 100, + subgroup = 'fu_item_subgroup_c', + order = 'c-a', + }, +}) diff --git a/prototypes/fusion/fu_plasma.lua b/prototypes/fusion/fu_plasma.lua new file mode 100644 index 0000000..8f27dfd --- /dev/null +++ b/prototypes/fusion/fu_plasma.lua @@ -0,0 +1,173 @@ +--local functions +local function config(name) + return settings.startup['fu_plasma_'..name].value +end + +local function sprite(name) + return '__248k__/ressources/fusion/fu_plasma/fu_plasma_'..name +end + +--item +data:extend({ + { + name = 'fu_plasma_item', + type = 'item', + icon = sprite('icon.png'), + icon_size = 64, + place_result = 'fu_plasma_entity', + stack_size = 20, + subgroup = 'fu_item_subgroup_c', + order = 'a-b', + }, + +}) + +--entity +data:extend({ + --prototype + { + name = 'fu_plasma_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_plasma_item', + }, + crafting_categories = {'fu_plasma_category'}, + crafting_speed = 1, + ingredient_count = 2, + --fixed_recipe = 'el_water_pressure_recipe', + energy_source = { + type = 'electric', + usage_priority = 'secondary-input', + }, + energy_usage = '60MW', + fluid_boxes = { + { + + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {type = "input", position = {0, -4}}, + }, + production_type = "input" + }, + { + + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {type = "input", position = {-4, 0}} + }, + production_type = "input" + }, + { + + base_area = 1, + height = 2, + base_level = 1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {type = "output", position = {4, 0}}, + --{type = "output", position = {2, -2.5}} + }, + production_type = "output" + }, + { + + base_area = 1, + height = 2, + base_level = 1, + pipe_covers = pipecoverspictures(), + pipe_connections = + { + {type = "output", position = {0, 4}}, + }, + production_type = "output" + }, + }, + --animation + animation = { + north = { + 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.1} + }, + east = { + 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.1} + }, + south = { + 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.1} + }, + west = { + 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.1} + }, + }, + working_sound = + { + sound = {filename = "__base__/sound/chemical-plant-3.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_reactor.lua b/prototypes/fusion/fu_reactor.lua index b50b62d..5c007b0 100644 --- a/prototypes/fusion/fu_reactor.lua +++ b/prototypes/fusion/fu_reactor.lua @@ -228,7 +228,7 @@ data:extend({ --animation animation = { north = { - filename = sprite('tokamak_entity_animation_vertikal.png'), + filename = sprite('tokamak_entity_animation.png'), size = {512*3,512*2}, scale = 0.37, line_length = 3, @@ -238,7 +238,7 @@ data:extend({ shift = {2.34,0.3}, }, east = { - filename = sprite('tokamak_entity_animation_horizontal.png'), + filename = sprite('tokamak_entity_animation.png'), size = {512*3,512*2}, scale = 0.37, line_length = 3, @@ -248,7 +248,7 @@ data:extend({ shift = {2.34,0.3}, }, south = { - filename = sprite('tokamak_entity_animation_vertikal.png'), + filename = sprite('tokamak_entity_animation.png'), size = {512*3,512*2}, scale = 0.37, line_length = 3, @@ -258,7 +258,7 @@ data:extend({ shift = {2.34,0.3}, }, west = { - filename = sprite('tokamak_entity_animation_horizontal.png'), + filename = sprite('tokamak_entity_animation.png'), size = {512*3,512*2}, scale = 0.37, line_length = 3, diff --git a/ressources/electronic/el_arc_furnace/el_arc_furnace_entity_animation.png b/ressources/electronic/el_arc_furnace/el_arc_furnace_entity_animation.png new file mode 100644 index 0000000..6bccba5 Binary files /dev/null and b/ressources/electronic/el_arc_furnace/el_arc_furnace_entity_animation.png differ diff --git a/ressources/electronic/el_arc_furnace/el_arc_furnace_icon.png b/ressources/electronic/el_arc_furnace/el_arc_furnace_icon.png new file mode 100644 index 0000000..5aac1fd Binary files /dev/null and b/ressources/electronic/el_arc_furnace/el_arc_furnace_icon.png differ diff --git a/ressources/electronic/el_caster/el_caster_entity_animation.png b/ressources/electronic/el_caster/el_caster_entity_animation.png new file mode 100644 index 0000000..bc5d7d1 Binary files /dev/null and b/ressources/electronic/el_caster/el_caster_entity_animation.png differ diff --git a/ressources/electronic/el_caster/el_caster_icon.png b/ressources/electronic/el_caster/el_caster_icon.png new file mode 100644 index 0000000..d39229b Binary files /dev/null and b/ressources/electronic/el_caster/el_caster_icon.png differ diff --git a/ressources/electronic/el_grower/el_grower_entity_animation.png b/ressources/electronic/el_grower/el_grower_entity_animation.png new file mode 100644 index 0000000..b552bdc Binary files /dev/null and b/ressources/electronic/el_grower/el_grower_entity_animation.png differ diff --git a/ressources/electronic/el_grower/el_grower_icon.png b/ressources/electronic/el_grower/el_grower_icon.png new file mode 100644 index 0000000..a66eff9 Binary files /dev/null and b/ressources/electronic/el_grower/el_grower_icon.png differ diff --git a/ressources/electronic/el_materials/el_materials_ALK.png b/ressources/electronic/el_materials/el_materials_ALK.png new file mode 100644 index 0000000..8663fd1 Binary files /dev/null and b/ressources/electronic/el_materials/el_materials_ALK.png differ diff --git a/ressources/electronic/el_materials/el_materials_ceramic.png b/ressources/electronic/el_materials/el_materials_ceramic.png new file mode 100644 index 0000000..a4cdfe6 Binary files /dev/null and b/ressources/electronic/el_materials/el_materials_ceramic.png differ diff --git a/ressources/electronic/el_materials/el_materials_pure_aluminum.png b/ressources/electronic/el_materials/el_materials_pure_aluminum.png new file mode 100644 index 0000000..1d07e88 Binary files /dev/null and b/ressources/electronic/el_materials/el_materials_pure_aluminum.png differ diff --git a/ressources/electronic/el_materials/el_materials_pure_copper.png b/ressources/electronic/el_materials/el_materials_pure_copper.png new file mode 100644 index 0000000..b7188be Binary files /dev/null and b/ressources/electronic/el_materials/el_materials_pure_copper.png differ diff --git a/ressources/electronic/el_materials/el_materials_pure_iron.png b/ressources/electronic/el_materials/el_materials_pure_iron.png new file mode 100644 index 0000000..8ea5e45 Binary files /dev/null and b/ressources/electronic/el_materials/el_materials_pure_iron.png differ diff --git a/ressources/electronic/el_purifier/el_purifier_entity_animation.png b/ressources/electronic/el_purifier/el_purifier_entity_animation.png new file mode 100644 index 0000000..23d02e2 Binary files /dev/null and b/ressources/electronic/el_purifier/el_purifier_entity_animation.png differ diff --git a/ressources/electronic/el_purifier/el_purifier_icon.png b/ressources/electronic/el_purifier/el_purifier_icon.png new file mode 100644 index 0000000..a2e5bc5 Binary files /dev/null and b/ressources/electronic/el_purifier/el_purifier_icon.png differ diff --git a/ressources/fission/fi_compound_machine/fi_compound_machine_entity_animation.png b/ressources/fission/fi_compound_machine/fi_compound_machine_entity_animation.png new file mode 100644 index 0000000..e160180 Binary files /dev/null and b/ressources/fission/fi_compound_machine/fi_compound_machine_entity_animation.png differ diff --git a/ressources/fission/fi_compound_machine/fi_compound_machine_icon.png b/ressources/fission/fi_compound_machine/fi_compound_machine_icon.png new file mode 100644 index 0000000..1856dcd Binary files /dev/null and b/ressources/fission/fi_compound_machine/fi_compound_machine_icon.png differ diff --git a/ressources/fission/fi_crushed/fi_crushed_glass_item.png b/ressources/fission/fi_crushed/fi_crushed_glass_item.png new file mode 100644 index 0000000..e35036a Binary files /dev/null and b/ressources/fission/fi_crushed/fi_crushed_glass_item.png differ diff --git a/ressources/fission/fi_crushed/fi_crushed_stone_item.png b/ressources/fission/fi_crushed/fi_crushed_stone_item.png new file mode 100644 index 0000000..0d8f3bb Binary files /dev/null and b/ressources/fission/fi_crushed/fi_crushed_stone_item.png differ diff --git a/ressources/fission/fi_crushed/fi_crushed_uranium_item.png b/ressources/fission/fi_crushed/fi_crushed_uranium_item.png new file mode 100644 index 0000000..3ac1a58 Binary files /dev/null and b/ressources/fission/fi_crushed/fi_crushed_uranium_item.png differ diff --git a/ressources/fission/fi_fiberer/fi_fiberer_entity_animation.png b/ressources/fission/fi_fiberer/fi_fiberer_entity_animation.png new file mode 100644 index 0000000..74fb112 Binary files /dev/null and b/ressources/fission/fi_fiberer/fi_fiberer_entity_animation.png differ diff --git a/ressources/fission/fi_fiberer/fi_fiberer_icon.png b/ressources/fission/fi_fiberer/fi_fiberer_icon.png new file mode 100644 index 0000000..965d10e Binary files /dev/null and b/ressources/fission/fi_fiberer/fi_fiberer_icon.png differ diff --git a/ressources/fission/fi_materials/fi_materials_GFK.png b/ressources/fission/fi_materials/fi_materials_GFK.png new file mode 100644 index 0000000..49940d2 Binary files /dev/null and b/ressources/fission/fi_materials/fi_materials_GFK.png differ diff --git a/ressources/fission/fi_materials/fi_materials_NFK.png b/ressources/fission/fi_materials/fi_materials_NFK.png new file mode 100644 index 0000000..d9c3f03 Binary files /dev/null and b/ressources/fission/fi_materials/fi_materials_NFK.png differ diff --git a/ressources/fission/fi_materials/fi_materials_flourite.png b/ressources/fission/fi_materials/fi_materials_flourite.png new file mode 100644 index 0000000..08e0fdf Binary files /dev/null and b/ressources/fission/fi_materials/fi_materials_flourite.png differ diff --git a/ressources/fission/fi_materials/fi_materials_glass.png b/ressources/fission/fi_materials/fi_materials_glass.png new file mode 100644 index 0000000..14b92c1 Binary files /dev/null and b/ressources/fission/fi_materials/fi_materials_glass.png differ diff --git a/ressources/fission/fi_materials/fi_materials_glass_fiber.png b/ressources/fission/fi_materials/fi_materials_glass_fiber.png new file mode 100644 index 0000000..f7a230c Binary files /dev/null and b/ressources/fission/fi_materials/fi_materials_glass_fiber.png differ diff --git a/ressources/fission/fi_materials/fi_materials_gold.png b/ressources/fission/fi_materials/fi_materials_gold.png new file mode 100644 index 0000000..a502c31 Binary files /dev/null and b/ressources/fission/fi_materials/fi_materials_gold.png differ diff --git a/ressources/fission/fi_materials/fi_materials_natural_fiber.png b/ressources/fission/fi_materials/fi_materials_natural_fiber.png new file mode 100644 index 0000000..32b9b50 Binary files /dev/null and b/ressources/fission/fi_materials/fi_materials_natural_fiber.png differ diff --git a/ressources/fission/fi_materials/fi_materials_neodym.png b/ressources/fission/fi_materials/fi_materials_neodym.png new file mode 100644 index 0000000..926d93e Binary files /dev/null and b/ressources/fission/fi_materials/fi_materials_neodym.png differ diff --git a/ressources/fission/fi_materials/fi_materials_pure_gold.png b/ressources/fission/fi_materials/fi_materials_pure_gold.png new file mode 100644 index 0000000..c8f2f10 Binary files /dev/null and b/ressources/fission/fi_materials/fi_materials_pure_gold.png differ diff --git a/ressources/fission/fi_materials/fi_materials_pure_neodym.png b/ressources/fission/fi_materials/fi_materials_pure_neodym.png new file mode 100644 index 0000000..57b9730 Binary files /dev/null and b/ressources/fission/fi_materials/fi_materials_pure_neodym.png differ diff --git a/ressources/fission/fi_materials/fi_materials_pure_titan.png b/ressources/fission/fi_materials/fi_materials_pure_titan.png new file mode 100644 index 0000000..95fbd64 Binary files /dev/null and b/ressources/fission/fi_materials/fi_materials_pure_titan.png differ diff --git a/ressources/fission/fi_materials/fi_materials_titan.png b/ressources/fission/fi_materials/fi_materials_titan.png new file mode 100644 index 0000000..526889e Binary files /dev/null and b/ressources/fission/fi_materials/fi_materials_titan.png differ diff --git a/ressources/fluids/el_arc_pure_aluminum.png b/ressources/fluids/el_arc_pure_aluminum.png new file mode 100644 index 0000000..9a095ad Binary files /dev/null and b/ressources/fluids/el_arc_pure_aluminum.png differ diff --git a/ressources/fluids/el_arc_pure_copper.png b/ressources/fluids/el_arc_pure_copper.png new file mode 100644 index 0000000..8b51079 Binary files /dev/null and b/ressources/fluids/el_arc_pure_copper.png differ diff --git a/ressources/fluids/el_arc_pure_gold.png b/ressources/fluids/el_arc_pure_gold.png new file mode 100644 index 0000000..c53c842 Binary files /dev/null and b/ressources/fluids/el_arc_pure_gold.png differ diff --git a/ressources/fluids/el_arc_pure_iron.png b/ressources/fluids/el_arc_pure_iron.png new file mode 100644 index 0000000..b9401e2 Binary files /dev/null and b/ressources/fluids/el_arc_pure_iron.png differ diff --git a/ressources/fluids/el_dirty_water.png b/ressources/fluids/el_dirty_water.png new file mode 100644 index 0000000..42b2b00 Binary files /dev/null and b/ressources/fluids/el_dirty_water.png differ diff --git a/ressources/fluids/el_kerosene.png b/ressources/fluids/el_kerosene.png index 4565258..31cdab5 100644 Binary files a/ressources/fluids/el_kerosene.png and b/ressources/fluids/el_kerosene.png differ diff --git a/ressources/fluids/fi_arc_glass.png b/ressources/fluids/fi_arc_glass.png new file mode 100644 index 0000000..207eab9 Binary files /dev/null and b/ressources/fluids/fi_arc_glass.png differ diff --git a/ressources/fluids/fi_arc_gold.png b/ressources/fluids/fi_arc_gold.png new file mode 100644 index 0000000..18d642a Binary files /dev/null and b/ressources/fluids/fi_arc_gold.png differ diff --git a/ressources/fluids/fi_arc_neodym.png b/ressources/fluids/fi_arc_neodym.png new file mode 100644 index 0000000..a73077b Binary files /dev/null and b/ressources/fluids/fi_arc_neodym.png differ diff --git a/ressources/fluids/fi_arc_titan.png b/ressources/fluids/fi_arc_titan.png new file mode 100644 index 0000000..58156a7 Binary files /dev/null and b/ressources/fluids/fi_arc_titan.png differ diff --git a/ressources/fluids/fi_dirty_water.png b/ressources/fluids/fi_dirty_water.png new file mode 100644 index 0000000..3808fb5 Binary files /dev/null and b/ressources/fluids/fi_dirty_water.png differ diff --git a/ressources/fluids/fi_strong_acid.png b/ressources/fluids/fi_strong_acid.png new file mode 100644 index 0000000..b0464a6 Binary files /dev/null and b/ressources/fluids/fi_strong_acid.png differ diff --git a/ressources/fluids/fu_arc_pure_lead.png b/ressources/fluids/fu_arc_pure_lead.png new file mode 100644 index 0000000..4bb14ff Binary files /dev/null and b/ressources/fluids/fu_arc_pure_lead.png differ diff --git a/ressources/fluids/fu_lead_fluid.png b/ressources/fluids/fu_lead_fluid.png index efb21fa..64bb256 100644 Binary files a/ressources/fluids/fu_lead_fluid.png and b/ressources/fluids/fu_lead_fluid.png differ diff --git a/ressources/fluids/fu_metal_foam.png b/ressources/fluids/fu_metal_foam.png new file mode 100644 index 0000000..20791dc Binary files /dev/null and b/ressources/fluids/fu_metal_foam.png differ diff --git a/ressources/fusion/fu_fusor/fu_fusor_tech_sign_item.png b/ressources/fusion/fu_fusor/fu_fusor_tech_sign_item.png index 4d6e5e6..c4b2d08 100644 Binary files a/ressources/fusion/fu_fusor/fu_fusor_tech_sign_item.png and b/ressources/fusion/fu_fusor/fu_fusor_tech_sign_item.png differ diff --git a/ressources/fusion/fu_laser/fu_laser_entity_animation.png b/ressources/fusion/fu_laser/fu_laser_entity_animation.png new file mode 100644 index 0000000..75c7d96 Binary files /dev/null and b/ressources/fusion/fu_laser/fu_laser_entity_animation.png differ diff --git a/ressources/fusion/fu_laser/fu_laser_icon.png b/ressources/fusion/fu_laser/fu_laser_icon.png new file mode 100644 index 0000000..fc4ee86 Binary files /dev/null and b/ressources/fusion/fu_laser/fu_laser_icon.png differ diff --git a/ressources/fusion/fu_magnet/fu_magnet_entity_animation.png b/ressources/fusion/fu_magnet/fu_magnet_entity_animation.png new file mode 100644 index 0000000..bed9edd Binary files /dev/null and b/ressources/fusion/fu_magnet/fu_magnet_entity_animation.png differ diff --git a/ressources/fusion/fu_magnet/fu_magnet_icon.png b/ressources/fusion/fu_magnet/fu_magnet_icon.png new file mode 100644 index 0000000..69e54be Binary files /dev/null and b/ressources/fusion/fu_magnet/fu_magnet_icon.png differ diff --git a/ressources/fusion/fu_materials/fu_materials_KFK.png b/ressources/fusion/fu_materials/fu_materials_KFK.png new file mode 100644 index 0000000..9734b96 Binary files /dev/null and b/ressources/fusion/fu_materials/fu_materials_KFK.png differ diff --git a/ressources/fusion/fu_materials/fu_materials_TIM.png b/ressources/fusion/fu_materials/fu_materials_TIM.png new file mode 100644 index 0000000..2e26733 Binary files /dev/null and b/ressources/fusion/fu_materials/fu_materials_TIM.png differ diff --git a/ressources/fusion/fu_materials/fu_materials_carbon_fiber.png b/ressources/fusion/fu_materials/fu_materials_carbon_fiber.png new file mode 100644 index 0000000..3b47906 Binary files /dev/null and b/ressources/fusion/fu_materials/fu_materials_carbon_fiber.png differ diff --git a/ressources/fusion/fu_materials/fu_materials_energy_crystal.png b/ressources/fusion/fu_materials/fu_materials_energy_crystal.png new file mode 100644 index 0000000..9da8460 Binary files /dev/null and b/ressources/fusion/fu_materials/fu_materials_energy_crystal.png differ diff --git a/ressources/fusion/fu_materials/fu_materials_fusion_card.png b/ressources/fusion/fu_materials/fu_materials_fusion_card.png new file mode 100644 index 0000000..81b1f33 Binary files /dev/null and b/ressources/fusion/fu_materials/fu_materials_fusion_card.png differ diff --git a/ressources/fusion/fu_materials/fu_materials_laser_card.png b/ressources/fusion/fu_materials/fu_materials_laser_card.png new file mode 100644 index 0000000..aaf5fc2 Binary files /dev/null and b/ressources/fusion/fu_materials/fu_materials_laser_card.png differ diff --git a/ressources/fusion/fu_materials/fu_materials_magnet.png b/ressources/fusion/fu_materials/fu_materials_magnet.png new file mode 100644 index 0000000..77f98f7 Binary files /dev/null and b/ressources/fusion/fu_materials/fu_materials_magnet.png differ diff --git a/ressources/fusion/fu_materials/fu_materials_magnet_card.png b/ressources/fusion/fu_materials/fu_materials_magnet_card.png new file mode 100644 index 0000000..7833eac Binary files /dev/null and b/ressources/fusion/fu_materials/fu_materials_magnet_card.png differ diff --git a/ressources/fusion/fu_materials/fu_materials_plasma_card.png b/ressources/fusion/fu_materials/fu_materials_plasma_card.png new file mode 100644 index 0000000..5c1f4b1 Binary files /dev/null and b/ressources/fusion/fu_materials/fu_materials_plasma_card.png differ diff --git a/ressources/fusion/fu_materials/fu_materials_pure_lead.png b/ressources/fusion/fu_materials/fu_materials_pure_lead.png new file mode 100644 index 0000000..ad9d630 Binary files /dev/null and b/ressources/fusion/fu_materials/fu_materials_pure_lead.png differ diff --git a/ressources/fusion/fu_materials/fu_materials_refined_crystal.png b/ressources/fusion/fu_materials/fu_materials_refined_crystal.png new file mode 100644 index 0000000..3860ae5 Binary files /dev/null and b/ressources/fusion/fu_materials/fu_materials_refined_crystal.png differ diff --git a/ressources/fusion/fu_plasma/fu_plasma_entity_animation.png b/ressources/fusion/fu_plasma/fu_plasma_entity_animation.png new file mode 100644 index 0000000..b866045 Binary files /dev/null and b/ressources/fusion/fu_plasma/fu_plasma_entity_animation.png differ diff --git a/ressources/fusion/fu_plasma/fu_plasma_icon.png b/ressources/fusion/fu_plasma/fu_plasma_icon.png new file mode 100644 index 0000000..8088be7 Binary files /dev/null and b/ressources/fusion/fu_plasma/fu_plasma_icon.png differ diff --git a/ressources/fusion/fu_reactor/fu_reactor_tokamak_entity_animation.png b/ressources/fusion/fu_reactor/fu_reactor_tokamak_entity_animation.png new file mode 100644 index 0000000..9410698 Binary files /dev/null and b/ressources/fusion/fu_reactor/fu_reactor_tokamak_entity_animation.png differ diff --git a/ressources/fusion/fu_reactor/fu_reactor_tokamak_entity_icon.png b/ressources/fusion/fu_reactor/fu_reactor_tokamak_entity_icon.png index 2190059..fd213ea 100644 Binary files a/ressources/fusion/fu_reactor/fu_reactor_tokamak_entity_icon.png and b/ressources/fusion/fu_reactor/fu_reactor_tokamak_entity_icon.png differ diff --git a/ressources/fusion/fu_reactor/fu_reactor_tokamak_item.png b/ressources/fusion/fu_reactor/fu_reactor_tokamak_item.png index 2190059..fd213ea 100644 Binary files a/ressources/fusion/fu_reactor/fu_reactor_tokamak_item.png and b/ressources/fusion/fu_reactor/fu_reactor_tokamak_item.png differ diff --git a/ressources/techs/el_ALK_tech.png b/ressources/techs/el_ALK_tech.png new file mode 100644 index 0000000..ee6880d Binary files /dev/null and b/ressources/techs/el_ALK_tech.png differ diff --git a/ressources/techs/el_arc_furnace_tech.png b/ressources/techs/el_arc_furnace_tech.png new file mode 100644 index 0000000..56ddee1 Binary files /dev/null and b/ressources/techs/el_arc_furnace_tech.png differ diff --git a/ressources/techs/el_caster_tech.png b/ressources/techs/el_caster_tech.png new file mode 100644 index 0000000..ea8c4a3 Binary files /dev/null and b/ressources/techs/el_caster_tech.png differ diff --git a/ressources/techs/el_grower_tech.png b/ressources/techs/el_grower_tech.png new file mode 100644 index 0000000..7e33898 Binary files /dev/null and b/ressources/techs/el_grower_tech.png differ diff --git a/ressources/techs/el_kerosene_tech.png b/ressources/techs/el_kerosene_tech.png index 66deeff..cfb9c80 100644 Binary files a/ressources/techs/el_kerosene_tech.png and b/ressources/techs/el_kerosene_tech.png differ diff --git a/ressources/techs/el_purifier_tech.png b/ressources/techs/el_purifier_tech.png new file mode 100644 index 0000000..d4ed6e6 Binary files /dev/null and b/ressources/techs/el_purifier_tech.png differ diff --git a/ressources/techs/fi_arc_furnace_tech.png b/ressources/techs/fi_arc_furnace_tech.png new file mode 100644 index 0000000..b20028d Binary files /dev/null and b/ressources/techs/fi_arc_furnace_tech.png differ diff --git a/ressources/techs/fi_compound_machine_tech.png b/ressources/techs/fi_compound_machine_tech.png new file mode 100644 index 0000000..3143b75 Binary files /dev/null and b/ressources/techs/fi_compound_machine_tech.png differ diff --git a/ressources/techs/fi_materials_tech.png b/ressources/techs/fi_crafter_tech.png similarity index 100% rename from ressources/techs/fi_materials_tech.png rename to ressources/techs/fi_crafter_tech.png diff --git a/ressources/techs/fi_fiberer_tech.png b/ressources/techs/fi_fiberer_tech.png new file mode 100644 index 0000000..7f519ce Binary files /dev/null and b/ressources/techs/fi_fiberer_tech.png differ diff --git a/ressources/techs/fi_flourite_tech.png b/ressources/techs/fi_flourite_tech.png new file mode 100644 index 0000000..3b19f24 Binary files /dev/null and b/ressources/techs/fi_flourite_tech.png differ diff --git a/ressources/techs/fi_glass_tech.png b/ressources/techs/fi_glass_tech.png new file mode 100644 index 0000000..ec8abff Binary files /dev/null and b/ressources/techs/fi_glass_tech.png differ diff --git a/ressources/techs/fi_purifier_tech.png b/ressources/techs/fi_purifier_tech.png new file mode 100644 index 0000000..42a8365 Binary files /dev/null and b/ressources/techs/fi_purifier_tech.png differ diff --git a/ressources/techs/fu_KFK_tech.png b/ressources/techs/fu_KFK_tech.png new file mode 100644 index 0000000..a991e11 Binary files /dev/null and b/ressources/techs/fu_KFK_tech.png differ diff --git a/ressources/techs/fu_TIM_tech.png b/ressources/techs/fu_TIM_tech.png new file mode 100644 index 0000000..0d0f801 Binary files /dev/null and b/ressources/techs/fu_TIM_tech.png differ diff --git a/ressources/techs/fu_laser_tech.png b/ressources/techs/fu_laser_tech.png new file mode 100644 index 0000000..880ee5e Binary files /dev/null and b/ressources/techs/fu_laser_tech.png differ diff --git a/ressources/techs/fu_magnet_tech.png b/ressources/techs/fu_magnet_tech.png new file mode 100644 index 0000000..58bb831 Binary files /dev/null and b/ressources/techs/fu_magnet_tech.png differ diff --git a/ressources/techs/fu_plasma_tech.png b/ressources/techs/fu_plasma_tech.png new file mode 100644 index 0000000..5959a2f Binary files /dev/null and b/ressources/techs/fu_plasma_tech.png differ diff --git a/ressources/techs/fu_tokamak_tech.png b/ressources/techs/fu_tokamak_tech.png index b94be5f..4ea876f 100644 Binary files a/ressources/techs/fu_tokamak_tech.png and b/ressources/techs/fu_tokamak_tech.png differ diff --git a/settings.lua b/settings.lua index 30c5604..420205c 100644 --- a/settings.lua +++ b/settings.lua @@ -5,7 +5,7 @@ data:extend({ name = 'el_solar_power_output', type = 'int-setting', setting_type = 'startup', - default_value = 200000, + default_value = 80000, minimum_value = 1, maximum_value = 10^10, order = 'a',