diff --git a/data.lua b/data.lua index f5fa5dc..2080854 100644 --- a/data.lua +++ b/data.lua @@ -63,7 +63,6 @@ require('prototypes/fusion/fu_magnet') require('prototypes/gravitation/gr_crafter') require('prototypes/gravitation/gr_materials') require('prototypes/gravitation/gr_train') -require('prototypes/gravitation/gr_cooker') require('prototypes/gravitation/gr_charger') require('prototypes/gravitation/gr_black_hole') require('prototypes/gravitation/gr_white_hole') diff --git a/locale/en/lang_en.cfg b/locale/en/lang_en.cfg index 01b82bb..c3e096f 100644 --- a/locale/en/lang_en.cfg +++ b/locale/en/lang_en.cfg @@ -23,6 +23,12 @@ fi_ki_science=KI2 tech fu_ki_science=KI3 tech el_ki_selction_tool=KI selctor +el_materials_ALK=Aluminium-ceramic composite +el_materials_ceramic=Ceramic +el_materials_pure_iron=Pure iron +el_materials_pure_copper=Pure copper +el_materials_pure_aluminum=Pure aluminium + fi_uranium233_item=Uranium-233 fi_plutonium239_item=Plutonium-239 fi_thorium232_item=Thorium-232 @@ -58,6 +64,22 @@ fi_modules_productivity_4_item=Gauss Module "4.Art" fi_modules_productivity_5_item=Gauss Module "5.Art" fi_modules_productivity_6_item=Gauss Module "6.Art" +fi_crushed_glass_item=Crushed glass +fi_crushed_stone_item=Crushed stone +fi_crushed_uranium_item=Crushed uranium +fi_materials_glass=Glass +fi_materials_glass_fiber=Fiberglass +fi_materials_natural_fiber=Natural fiber +fi_materials_gold=Gold +fi_materials_neodym=Neodymium +fi_materials_titan=Titanium +fi_materials_flourite=Flourite +fi_materials_pure_gold=Pure gold +fi_materials_pure_neodym=Pure neodymium +fi_materials_pure_titan=Pure titanium +fi_materials_GFK=Fiberglass reinforced plastic +fi_materials_NFK=Natural fiber reinforced plastic + fu_tech_sign_item=Fusion tech @@ -75,6 +97,19 @@ fu_space_probe_down_matter_item=Structured exotic matter(down) fu_space_probe_ore_item=Deep space ore fu_space_probe_science_item=Exotic science pack +fu_materials_pure_lead=Pure lead +fu_materials_energy_crystal=High energy crystal +fu_materials_refined_crystal=Refined crystal +fu_materials_KFK=Carbon fiber reinforced plastic +fu_materials_magnet=Magnet +fu_materials_carbon_fiber=Carbon fiber +fu_materials_TIM=Titanium-metal composite +fu_materials_fusion_card=Fusion data +fu_materials_plasma_card=Plasma data +fu_materials_magnet_card=Magnetising data +fu_materials_laser_card=Laser data + + gr_materials_fusion_cell_item=Compact fusion cell gr_materials_stack_down_item=Combined matter (down) gr_materials_stack_up_item=Combined matter (up) @@ -83,6 +118,13 @@ gr_materials_refined_crystal_item=Freshly refined crystal gr_materials_crushed_exotic_item=Crushed exotic matter gr_materials_stabilizer_item=Exotic matter stabilizer +gr_materials_circuit=HCP circuit +gr_materials_gold_wire=Gold cable +gr_materials_pcb=PCB +gr_materials_magnet=HLP magnet +gr_materials_plasma_cube=Plasma container + + gr_materials_red_item=3,6k element gr_materials_red_pack_item=Red pack @@ -129,7 +171,20 @@ el_desulfurized_kerosene=Desulfurized kerosene el_ki_memory_fluid=KI1 memory el_ki_cpu_fluid=KI1 computing power +el_dirty_water=Dirty water +el_arc_pure_copper=Molten copper +el_arc_pure_iron=Molten iron +el_arc_pure_aluminum=Molten aluminium + + fi_crystal_fluid=Crystal matrix (liquid) +fi_dirty_water=Rich water +fi_strong_acid=Hydrofluoric acid +fi_arc_glass=Molten glass +fi_arc_gold=Molten gold +fi_arc_titan=Molten titan +fi_arc_neodym=Molten neodymium + fu_hydrogen=Hydrogen fu_oxygen=Oxygen @@ -142,6 +197,9 @@ fu_helium_3=Helium-He[3] fu_helium_4=Helium-He[4] fu_iron=Iron-Fe[56] +fu_arc_pure_lead=Molten lead +fu_metal_foam=Metal foam + fu_protium_heated=Heated protium-H[1] fu_iron_heated=Heated iron-Fe[56] fu_copper=Copper-Cu[63] @@ -229,6 +287,11 @@ fu_ki_core_slave_container_entity=KI3 core fi_ki_circuit_entity=KI2 energy provider fu_ki_circuit_entity=KI3 energy provider +el_arc_furnace_entity=Arc furnace +el_caster_entity=Metal caster +el_purifier_entity=Purifier +el_grower_entity=Crystal grower + fi_crafter_entity=Nuclear assembling machine @@ -238,6 +301,10 @@ fi_crusher_entity=Crushing factory fi_robo_port_entity=Advanced roboport fi_robo_charger_entity=Charging station +fi_fiberer_entity=Fiber maker +fi_compound_machine_entity=Compound material facility + + fu_boiler_entity=Thermochemical separator fu_burner_entity=Burner fu_fusor_entity=Research fusor @@ -253,6 +320,10 @@ fu_star_engine_core_entity=Star engine - fusion core fu_star_engine_heater_entity=Star engine - heating unit (right side) fu_star_engine_heater_left_entity=Star engine - heating unit (left side) +fu_laser_entity=Laser facility +fu_plasma_entity=Plasma facility +fu_magnet_entity=Magnetising facility + gr_crafter_entity=Fusion assembling machine gr_magnet_train_pre_entity=EM suspension train 1 gr_magnet_wagon_pre_entity=EM suspension wagon 1 @@ -382,6 +453,32 @@ gr_white_tech=248k element gr_ind2_tech=Advanced elements +el_ALK_tech=Aluminium-ceramic composite metal +el_arc_furnace_tech=Arc furnace +el_purifier_tech=Ore purification +el_caster_tech=Metal casting +el_grower_tech=Crystal growing + +fi_glass_tech=Glass +fi_flourite_tech=Flourite +fi_fiberer_tech=Fiber production +fi_purifier_tech=Advanced ore purification +fi_purifier_2_tech=Advanced uranium purification +fi_caster_tech=Advanced metal casting +fi_crafter_tech=Nuclear crafting + +fu_KFK_tech=Carbon fiber reinforced plastic +fu_TIM_tech=Titanium-metal composite material +fu_laser_tech=Laser facility +fu_magnet_tech=Magnetising facility +fu_plasma_tech=Plasma facility + +gr_circuit_tech=High-end circuits +gr_plasma_cube_tech=Plasma containers +gr_magnet_tech=High-end magnets + + + #effects [description] el_stage_eff=Allows you to get into the first stage of the 248k mod. diff --git a/prototypes/248k_fluids.lua b/prototypes/248k_fluids.lua index 3559471..f5da8b2 100644 --- a/prototypes/248k_fluids.lua +++ b/prototypes/248k_fluids.lua @@ -290,7 +290,7 @@ data:extend({ 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', + subgroup = 'fu_item_subgroup_f', order = 'a-a', }, { diff --git a/prototypes/248k_techs.lua b/prototypes/248k_techs.lua index 9d0073a..268f8a8 100644 --- a/prototypes/248k_techs.lua +++ b/prototypes/248k_techs.lua @@ -720,15 +720,15 @@ data:extend({ }, }, unit = { - count = '1000', + count = '2000', ingredients = { - {'chemical-science-pack',100}, - {'automation-science-pack',100}, - {'logistic-science-pack',100}, - {'production-science-pack',100}, - {'utility-science-pack',100}, - {'space-science-pack',100}, - {'fu_space_probe_science_item',100}, + {'chemical-science-pack',50}, + {'automation-science-pack',50}, + {'logistic-science-pack',50}, + {'production-science-pack',50}, + {'utility-science-pack',50}, + {'space-science-pack',50}, + {'fu_space_probe_science_item',50}, {'fi_ki_science',1}, {'fu_ki_science',1} }, @@ -748,15 +748,15 @@ data:extend({ }, }, unit = { - count = '2000', + count = '4000', ingredients = { - {'chemical-science-pack',100}, - {'automation-science-pack',100}, - {'logistic-science-pack',100}, - {'production-science-pack',100}, - {'utility-science-pack',100}, - {'space-science-pack',100}, - {'fu_space_probe_science_item',100}, + {'chemical-science-pack',50}, + {'automation-science-pack',50}, + {'logistic-science-pack',50}, + {'production-science-pack',50}, + {'utility-science-pack',50}, + {'space-science-pack',50}, + {'fu_space_probe_science_item',50}, {'fi_ki_science',1}, {'fu_ki_science',1} }, @@ -1003,7 +1003,15 @@ data:extend({ }, { type = 'unlock-recipe', - recipe = 'fi_pure_ore_recipe', + recipe = 'fi_pure_neodym_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fi_pure_titan_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fi_pure_gold_recipe', }, }, unit = { @@ -1580,7 +1588,6 @@ data:extend({ {'chemical-science-pack',1}, {'automation-science-pack',1}, {'logistic-science-pack',1}, - {'production-science-pack',1}, {'utility-science-pack',1}, }, time = 45, @@ -1610,7 +1617,6 @@ data:extend({ {'chemical-science-pack',1}, {'automation-science-pack',1}, {'logistic-science-pack',1}, - {'production-science-pack',1}, {'utility-science-pack',1}, }, time = 45, @@ -1644,7 +1650,6 @@ data:extend({ {'chemical-science-pack',1}, {'automation-science-pack',1}, {'logistic-science-pack',1}, - {'production-science-pack',1}, {'utility-science-pack',1}, }, time = 45, @@ -1669,12 +1674,11 @@ data:extend({ }, }, unit = { - count = '800', + count = '200', ingredients = { {'chemical-science-pack',1}, {'automation-science-pack',1}, {'logistic-science-pack',1}, - {'production-science-pack',1}, {'utility-science-pack',1}, }, time = 45, @@ -1699,12 +1703,11 @@ data:extend({ }, }, unit = { - count = '800', + count = '200', ingredients = { {'chemical-science-pack',1}, {'automation-science-pack',1}, {'logistic-science-pack',1}, - {'production-science-pack',1}, {'utility-science-pack',1}, }, time = 45, @@ -1717,7 +1720,7 @@ data:extend({ icon = sprite('fu_fusor_tech.png'), icon_size = 128, prerequisites = { - 'fu_lead_tech', + 'fu_magnet_tech','fu_basic_elements_tech' }, effects = { { @@ -1775,7 +1778,7 @@ data:extend({ icon = sprite('fu_basic_elements_tech.png'), icon_size = 128, prerequisites = { - 'fu_fusor_tech', + 'fu_lead_tech', }, effects = { { @@ -1820,7 +1823,7 @@ data:extend({ icon = sprite('fu_hydrogen_1_tech.png'), icon_size = 128, prerequisites = { - 'fu_basic_elements_tech', + 'fu_fusor_tech', }, effects = { { @@ -1900,7 +1903,7 @@ data:extend({ type = 'technology', icon = sprite('fu_energy_tech.png'), icon_size = 128, - prerequisites = {'fu_fusor_tech','fu_laser_tech','fu_magnet_tech','fu_plasma_tech'}, + prerequisites = {'fu_fusor_tech','fu_crystal_tech','fu_magnet_tech','fu_plasma_tech'}, effects = { { type = 'nothing', @@ -1961,6 +1964,10 @@ data:extend({ type = 'unlock-recipe', recipe = 'fu_lead_recipe', }, + { + type = 'unlock-recipe', + recipe = 'fu_heat_lead_recipe', + }, { type = 'unlock-recipe', recipe = 'fu_lead_crushed_recipe', @@ -2031,7 +2038,7 @@ data:extend({ }, }, unit = { - count = '400', + count = '1000', ingredients = { {'chemical-science-pack',1}, {'automation-science-pack',1}, @@ -2095,11 +2102,12 @@ data:extend({ }, }, unit = { - count = '400', + count = '2000', ingredients = { {'chemical-science-pack',1}, {'automation-science-pack',1}, {'logistic-science-pack',1}, + {'production-science-pack',1}, {'utility-science-pack',1} }, time = 45, @@ -2111,7 +2119,7 @@ data:extend({ type = 'technology', icon = sprite('fu_activator_tech.png'), icon_size = 128, - prerequisites = {'fu_fusor_tech'}, + prerequisites = {'fu_fusor_tech','fu_basic_elements_tech'}, effects = { { type = 'unlock-recipe', @@ -2520,7 +2528,7 @@ data:extend({ icon = sprite('gr_compact_fusion_tech.png'), icon_size = 128, prerequisites = { - 'gr_stage_tech' + 'gr_magnet_tech' }, effects = { { @@ -2674,7 +2682,7 @@ data:extend({ icon = sprite('gr_train_tech.png'), icon_size = 128, prerequisites = { - 'gr_compact_fusion_tech' + 'fu_magnet_tech','fu_space_probe_3_tech' }, effects = { { @@ -2691,7 +2699,7 @@ data:extend({ }, }, unit = { - count = '1000', + count = '200', ingredients = { {'chemical-science-pack',1}, {'automation-science-pack',1}, @@ -2710,7 +2718,7 @@ data:extend({ icon = sprite('gr_train_plus_tech.png'), icon_size = 128, prerequisites = { - 'gr_train_tech' + 'gr_train_tech','gr_compact_fusion_tech' }, effects = { { @@ -2769,53 +2777,13 @@ data:extend({ time = 100, }, }, - { - name = 'gr_cooker_tech', - type = 'technology', - icon = sprite('gr_cooker_tech.png'), - icon_size = 128, - prerequisites = { - 'gr_stage_tech' - }, - effects = { - { - type = 'unlock-recipe', - recipe = 'gr_cooker_recipe', - }, - { - type = 'unlock-recipe', - recipe = 'gr_cooker_fluid_recipe', - }, - { - type = 'unlock-recipe', - recipe = 'gr_cooked_crystal_recipe', - }, - { - type = 'unlock-recipe', - recipe = 'gr_refined_crystal_recipe', - }, - }, - unit = { - count = '400', - ingredients = { - {'chemical-science-pack',1}, - {'automation-science-pack',1}, - {'logistic-science-pack',1}, - {'production-science-pack',1}, - {'utility-science-pack',1}, - {'space-science-pack',1}, - {'fu_space_probe_science_item',1} - }, - time = 100, - }, - }, { name = 'gr_charger_tech', type = 'technology', icon = sprite('gr_charger_tech.png'), icon_size = 128, prerequisites = { - 'gr_stage_tech' + 'gr_magnet_tech' }, effects = { { @@ -2940,7 +2908,7 @@ data:extend({ icon = sprite('gr_red_tech.png'), icon_size = 128, prerequisites = { - 'gr_data_tech' + 'gr_lab_tech' }, effects = { { @@ -3214,4 +3182,96 @@ data:extend({ time = 100, }, }, + { + name = 'gr_circuit_tech', + type = 'technology', + icon = sprite('gr_circuit_tech.png'), + icon_size = 128, + prerequisites = { + 'gr_stage_tech' + }, + effects = { + { + type = 'unlock-recipe', + recipe = 'gr_circuit_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'gr_gold_wire_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'gr_pcb_recipe', + }, + }, + unit = { + count = '1000', + ingredients = { + {'chemical-science-pack',1}, + {'automation-science-pack',1}, + {'logistic-science-pack',1}, + {'production-science-pack',1}, + {'utility-science-pack',1}, + {'space-science-pack',1}, + {'fu_space_probe_science_item',1} + }, + time = 100, + }, + }, + { + name = 'gr_magnet_tech', + type = 'technology', + icon = sprite('gr_magnet_tech.png'), + icon_size = 128, + prerequisites = { + 'gr_plasma_cube_tech' + }, + effects = { + { + type = 'unlock-recipe', + recipe = 'gr_magnet_recipe', + }, + }, + unit = { + count = '1000', + ingredients = { + {'chemical-science-pack',1}, + {'automation-science-pack',1}, + {'logistic-science-pack',1}, + {'production-science-pack',1}, + {'utility-science-pack',1}, + {'space-science-pack',1}, + {'fu_space_probe_science_item',1} + }, + time = 100, + }, + }, + { + name = 'gr_plasma_cube_tech', + type = 'technology', + icon = sprite('gr_plasma_cube_tech.png'), + icon_size = 128, + prerequisites = { + 'gr_circuit_tech' + }, + effects = { + { + type = 'unlock-recipe', + recipe = 'gr_plasma_cube_recipe', + }, + }, + unit = { + count = '1000', + ingredients = { + {'chemical-science-pack',1}, + {'automation-science-pack',1}, + {'logistic-science-pack',1}, + {'production-science-pack',1}, + {'utility-science-pack',1}, + {'space-science-pack',1}, + {'fu_space_probe_science_item',1} + }, + time = 100, + }, + }, }) \ No newline at end of file diff --git a/prototypes/el_recipes.lua b/prototypes/el_recipes.lua index 63e51d2..7fd9359 100644 --- a/prototypes/el_recipes.lua +++ b/prototypes/el_recipes.lua @@ -360,8 +360,8 @@ data:extend({ enabled = 'false', category = 'crafting', ingredients = { - {type="item", name="steel-plate", amount=20}, - {type="item", name="fu_tech_sign_item", amount=100}, + {type="item", name="fu_materials_KFK", amount=20}, + {type="item", name="fu_tech_sign_item", amount=20}, {type="item", name="processing-unit", amount=20}, {type="item", name="fi_ki_beacon_item", amount=1}, }, @@ -422,7 +422,7 @@ data:extend({ enabled = 'false', category = 'crafting', ingredients = { - {type="item", name="steel-plate", amount=100}, + {type="item", name="fu_materials_KFK", amount=100}, {type="item", name="concrete", amount=500}, {type="item", name="electronic-circuit", amount=100}, {type="item", name="advanced-circuit", amount=100}, @@ -481,12 +481,12 @@ data:extend({ enabled = 'false', category = 'crafting', ingredients = { - {type="item", name="fi_industrial_steel_item", amount=80}, + {type="item", name="fu_materials_KFK", amount=40}, {type="item", name="concrete", amount=120}, {type="item", name="advanced-circuit", amount=100}, {type="item", name="processing-unit", amount=100}, - {type="item", name="fu_tech_sign_item", amount=100}, - {type="item", name="low-density-structure", amount=100}, + {type="item", name="fu_tech_sign_item", amount=20}, + {type="item", name="fu_materials_TIM", amount=40}, }, results = { {type="item", name="fu_ki_circuit_item", amount=1}, @@ -569,9 +569,9 @@ data:extend({ category = 'fu_ki_circuit_category', main_product = 'fu_ki_circuit_fluid', ingredients = { - {type="item", name="fu_tech_sign_item", amount=20}, + {type="item", name="fu_tech_sign_item", amount=8}, {type="item", name="advanced-circuit", amount=20}, - {type="item", name="fu_space_probe_science_item", amount=4}, + {type="item", name="fu_space_probe_science_item", amount=2}, }, results = { {type="fluid", name="fu_ki_circuit_fluid", amount=200, temperature = '500'}, @@ -585,9 +585,9 @@ data:extend({ category = 'fu_ki_circuit_category', main_product = 'fu_ki_circuit_fluid', ingredients = { - {type="item", name="fu_tech_sign_item", amount=16}, + {type="item", name="fu_tech_sign_item", amount=4}, {type="item", name="advanced-circuit", amount=16}, - {type="item", name="fu_space_probe_science_item", amount=2}, + {type="item", name="fu_space_probe_science_item", amount=1}, }, results = { {type="fluid", name="fu_ki_circuit_fluid", amount=200, temperature = '500'}, @@ -601,7 +601,7 @@ data:extend({ category = 'fu_ki_circuit_category', main_product = 'fu_ki_circuit_fluid', ingredients = { - {type="item", name="fu_tech_sign_item", amount=16}, + {type="item", name="fu_tech_sign_item", amount=4}, {type="item", name="advanced-circuit", amount=16}, }, results = { @@ -616,7 +616,7 @@ data:extend({ category = 'fu_ki_circuit_category', main_product = 'fu_ki_circuit_fluid', ingredients = { - {type="item", name="fu_tech_sign_item", amount=12}, + {type="item", name="fu_tech_sign_item", amount=3}, {type="item", name="advanced-circuit", amount=12}, }, results = { diff --git a/prototypes/fi_recipes.lua b/prototypes/fi_recipes.lua index cd5988d..191423a 100644 --- a/prototypes/fi_recipes.lua +++ b/prototypes/fi_recipes.lua @@ -1014,7 +1014,25 @@ data:extend({ always_show_made_in = true, }, { - name = 'fi_pure_ore_recipe', + name = 'fi_pure_neodym_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting-with-fluid', + main_product = 'fi_materials_pure_neodym', + 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=6}, + --{type="item", name="fi_materials_pure_titan", amount=2}, + }, + energy_required = 0.2, + order = 'a-b', + }, + { + name = 'fi_pure_gold_recipe', type = 'recipe', enabled = 'false', category = 'crafting-with-fluid', @@ -1024,9 +1042,27 @@ data:extend({ }, 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="fi_materials_pure_gold", amount=4}, + --{type="item", name="fi_materials_pure_neodym", amount=4}, + --{type="item", name="fi_materials_pure_titan", amount=2}, + }, + energy_required = 0.2, + order = 'a-b', + }, + { + name = 'fi_pure_titan_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting-with-fluid', + main_product = 'fi_materials_pure_titan', + 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=4}, + {type="item", name="fi_materials_pure_titan", amount=6}, }, energy_required = 0.2, order = 'a-b', diff --git a/prototypes/fu_recipes.lua b/prototypes/fu_recipes.lua index 6a4fe0e..1f40b7f 100644 --- a/prototypes/fu_recipes.lua +++ b/prototypes/fu_recipes.lua @@ -6,8 +6,9 @@ data:extend({ enabled = 'false', ingredients = { {'low-density-structure',100}, - {'fi_industrial_steel_item',400}, - {'fi_compound_material_item',400}, + {'fu_materials_TIM',100}, + {'fu_materials_KFK',100}, + {'fu_materials_magnet',20}, {'fi_energy_crystal_item',100}, {'concrete',500}, {'lab',10}, @@ -23,14 +24,14 @@ data:extend({ type = 'recipe', enabled = 'false', ingredients = { - {'low-density-structure',100}, - {'fi_industrial_steel_item',1000}, - {'fi_compound_material_item',1000}, - {'concrete',2000}, - {'fu_lead_item',1000}, - {'pump',40}, - {'processing-unit',1000}, - {'fu_tech_sign_item',500}, + {'fu_materials_magnet',100}, + {'fu_materials_TIM',200}, + {'fu_materials_KFK',200}, + {'concrete',500}, + {'fu_materials_energy_crystal',100}, + {'pump',80}, + {'processing-unit',500}, + {'fu_tech_sign_item',100}, }, result = 'fu_stelar_reactor_item', result_count = 1, @@ -41,14 +42,14 @@ data:extend({ type = 'recipe', enabled = 'false', ingredients = { - {'low-density-structure',200}, - {'fi_industrial_steel_item',1500}, - {'fi_compound_material_item',1500}, - {'concrete',2000}, - {'fu_lead_item',1500}, + {'fu_materials_magnet',200}, + {'fu_materials_TIM',400}, + {'fu_materials_KFK',400}, + {'concrete',500}, + {'fu_materials_energy_crystal',200}, {'pump',80}, - {'processing-unit',2000}, - {'fu_tech_sign_item',10000}, + {'processing-unit',500}, + {'fu_tech_sign_item',2000}, }, result = 'fu_tokamak_reactor_item', result_count = 1, @@ -62,8 +63,9 @@ data:extend({ enabled = 'false', ingredients = { {'heat-exchanger',4}, - {'fi_industrial_steel_item',80}, - {'fi_compound_material_item',80}, + {'fu_materials_TIM',20}, + {'fu_materials_KFK',20}, + {'fi_materials_GFK',20}, {'concrete',100}, {'heat-pipe',20} }, @@ -80,8 +82,8 @@ data:extend({ ingredients = { {'el_burner_item',1}, {'pipe',60}, - {'fi_compound_material_item',20}, - {'fi_energy_crystal_item',30} + {'fu_materials_KFK',25}, + {'fu_materials_TIM',15} }, result = 'fu_burner_item', result_count = 1, @@ -421,8 +423,8 @@ data:extend({ enabled = 'false', ingredients = { {type="item", name="heat-exchanger", amount=10}, - {type="item", name="fi_compound_material_item", amount=40}, - {type="item", name="fi_industrial_steel_item", amount=40}, + {type="item", name="fu_materials_KFK", amount=40}, + {type="item", name="fu_materials_TIM", amount=40}, {type="item", name="concrete", amount=60}, }, results = { @@ -479,8 +481,8 @@ data:extend({ ingredients = { {type="item", name="logistic-robot", amount=2}, {type="item", name="fu_tech_sign_item", amount=2}, - {type="item", name="fi_energy_crystal_item", amount=3}, - {type="item", name="low-density-structure", amount=20}, + {type="item", name="fu_materials_energy_crystal", amount=3}, + {type="item", name="fu_materials_KFK", amount=10}, {type="item", name="el_lithium_battery", amount=10}, {type="item", name="flying-robot-frame", amount=4}, }, @@ -495,8 +497,8 @@ data:extend({ ingredients = { {type="item", name="construction-robot", amount=2}, {type="item", name="fu_tech_sign_item", amount=2}, - {type="item", name="fi_energy_crystal_item", amount=3}, - {type="item", name="low-density-structure", amount=20}, + {type="item", name="fu_materials_energy_crystal", amount=3}, + {type="item", name="fu_materials_KFK", amount=10}, {type="item", name="el_lithium_battery", amount=10}, {type="item", name="flying-robot-frame", amount=4}, }, @@ -512,9 +514,9 @@ data:extend({ ingredients = { {type="item", name="fi_crafter_item", amount=2}, {type="item", name="fu_tech_sign_item", amount=100}, - {type="item", name="fi_energy_crystal_item", amount=20}, - {type="item", name="fi_compound_material_item", amount=200}, - {type="item", name="fi_industrial_steel_item", amount=200}, + {type="item", name="fu_materials_energy_crystal", amount=20}, + {type="item", name="fu_materials_KFK", amount=40}, + {type="item", name="fu_materials_TIM", amount=60}, }, result = 'fu_activator_item', result_count = 1, @@ -560,15 +562,14 @@ data:extend({ type = 'recipe', enabled = 'false', ingredients = { - {'low-density-structure',1000}, - {'fi_industrial_steel_item',1000}, - {'fi_compound_material_item',1000}, - {'copper-cable',1000}, - {'heat-exchanger',10}, - {'concrete',10000}, - {'fu_lead_item',4000}, - {'fi_energy_crystal_item',200}, - {'fu_tech_sign_item',10000}, + {'low-density-structure',200}, + {'fu_materials_KFK',200}, + {'fu_materials_TIM',200}, + {'heat-pipe',200}, + {'concrete',500}, + {'fu_materials_magnet',100}, + {'fu_materials_energy_crystal',100}, + {'fu_tech_sign_item',1000}, }, result = 'fu_star_engine_cooler_item', result_count = 1, @@ -579,15 +580,14 @@ data:extend({ type = 'recipe', enabled = 'false', ingredients = { - {'low-density-structure',1000}, - {'fi_industrial_steel_item',1000}, - {'fi_compound_material_item',1000}, - {'copper-cable',1000}, - {'heat-exchanger',10}, - {'concrete',10000}, - {'fu_lead_item',4000}, - {'fi_energy_crystal_item',200}, - {'fu_tech_sign_item',10000}, + {'low-density-structure',200}, + {'fu_materials_KFK',200}, + {'fu_materials_TIM',200}, + {'heat-pipe',200}, + {'concrete',500}, + {'fu_materials_magnet',100}, + {'fu_materials_energy_crystal',100}, + {'fu_tech_sign_item',1000}, }, result = 'fu_star_engine_cooler_up_item', result_count = 1, @@ -598,15 +598,14 @@ data:extend({ type = 'recipe', enabled = 'false', ingredients = { - {'low-density-structure',1000}, - {'fi_industrial_steel_item',1000}, - {'fi_compound_material_item',1000}, - {'copper-cable',1000}, + {'low-density-structure',200}, + {'fu_materials_KFK',200}, + {'fu_materials_TIM',200}, {'heat-pipe',200}, - {'concrete',10000}, - {'fu_lead_item',4000}, - {'fi_energy_crystal_item',200}, - {'fu_tech_sign_item',10000}, + {'concrete',500}, + {'fu_materials_magnet',100}, + {'fu_materials_energy_crystal',100}, + {'fu_tech_sign_item',1000}, }, result = 'fu_star_engine_heater_item', result_count = 1, @@ -617,15 +616,14 @@ data:extend({ type = 'recipe', enabled = 'false', ingredients = { - {'low-density-structure',1000}, - {'fi_industrial_steel_item',1000}, - {'fi_compound_material_item',1000}, - {'copper-cable',1000}, + {'low-density-structure',200}, + {'fu_materials_KFK',200}, + {'fu_materials_TIM',200}, {'heat-pipe',200}, - {'concrete',10000}, - {'fu_lead_item',4000}, - {'fi_energy_crystal_item',200}, - {'fu_tech_sign_item',10000}, + {'concrete',500}, + {'fu_materials_magnet',100}, + {'fu_materials_energy_crystal',100}, + {'fu_tech_sign_item',1000}, }, result = 'fu_star_engine_heater_left_item', result_count = 1, @@ -637,15 +635,15 @@ data:extend({ enabled = 'false', ingredients = { {'low-density-structure',1000}, - {'fi_industrial_steel_item',6000}, - {'fi_compound_material_item',3000}, - {'concrete',10000}, - {'fu_lead_item',4000}, - {'fi_energy_crystal_item',1000}, + {'fu_materials_KFK',200}, + {'fu_materials_TIM',200}, + {'concrete',2000}, + {'fu_materials_magnet',200}, + {'fu_materials_energy_crystal',200}, {'processing-unit',3000}, {'electronic-circuit',3000}, {'advanced-circuit',3000}, - {'fu_tech_sign_item',65535}, + {'fu_tech_sign_item',1000}, }, result = 'fu_star_engine_core_item', result_count = 1, @@ -949,8 +947,8 @@ data:extend({ enabled = 'false', ingredients = { {type="item", name="rocket-control-unit", amount=10}, - {type="item", name="low-density-structure", amount=100}, - {type="item", name="fusion-reactor-equipment", amount=1}, + {type="item", name="fu_materials_KFK", amount=20}, + {type="item", name="fu_materials_TIM", amount=10}, {type="item", name="processing-unit", amount=200}, {type="item", name="advanced-circuit", amount=100}, {type="item", name="radar", amount=10}, @@ -969,7 +967,7 @@ data:extend({ enabled = 'false', ingredients = { {type="item", name="rocket-control-unit", amount=10}, - {type="item", name="fi_energy_crystal_item", amount=100}, + {type="item", name="fu_materials_energy_crystal", amount=20}, {type="item", name="fu_space_probe_data_card_2_item", amount=5}, {type="item", name="processing-unit", amount=100}, {type="item", name="fu_space_probe_sputnik_item", amount=1}, @@ -990,7 +988,7 @@ data:extend({ {type="item", name="fu_space_probe_data_card_3_item", amount=5}, {type="item", name="fu_space_probe_probe_item", amount=1}, {type="item", name="rocket-control-unit", amount=10}, - {type="item", name="fi_energy_crystal_item", amount=100}, + {type="item", name="fu_materials_energy_crystal", amount=20}, {type="item", name="processing-unit", amount=100}, }, results = { @@ -1014,24 +1012,23 @@ data:extend({ {type="item", name="fu_space_probe_data_card_2_item", amount=1}, }, result_count = 1, - energy_required = 20, + energy_required = 10, always_show_made_in = true, }, -- space ore { name = 'fu_space_probe_ore_recipe', type = 'recipe', - category = 'centrifuging', + category = 'el_purifier_category', enabled = 'false', main_product = 'fu_space_probe_down_matter_item', ingredients = { {type="item", name="fu_space_probe_ore_item", amount=10}, - {type="item", name="fi_energy_crystal_item", amount=20}, + {type="fluid", name="fi_strong_acid", amount=1000}, }, results = { {type="item", name="fu_space_probe_down_matter_item", amount=1}, {type="item", name="fu_space_probe_up_matter_item", amount=1}, - {type="item", name="fi_base_crystal_item", amount=10}, }, result_count = 1, energy_required = 10, @@ -1044,15 +1041,15 @@ data:extend({ category = 'crafting', enabled = 'false', ingredients = { - {type="item", name="fu_space_probe_up_matter_item", amount=10}, - {type="item", name="fu_space_probe_down_matter_item", amount=10}, - {type="item", name="fu_tech_sign_item", amount=100}, + {type="item", name="fu_space_probe_up_matter_item", amount=1}, + {type="item", name="fu_space_probe_down_matter_item", amount=1}, + {type="item", name="fu_tech_sign_item", amount=10}, }, results = { - {type="item", name="fu_space_probe_science_item", amount=1000}, + {type="item", name="fu_space_probe_science_item", amount=200}, }, result_count = 1, - energy_required = 20, + energy_required = 3, }, { name = 'fu_space_probe_science_recipe_1', @@ -1060,15 +1057,15 @@ data:extend({ category = 'crafting', enabled = 'false', ingredients = { - {type="item", name="fu_space_probe_up_matter_item", amount=10}, - {type="item", name="fu_space_probe_down_matter_item", amount=10}, - {type="item", name="fu_tech_sign_item", amount=100}, + {type="item", name="fu_space_probe_up_matter_item", amount=1}, + {type="item", name="fu_space_probe_down_matter_item", amount=1}, + {type="item", name="fu_tech_sign_item", amount=10}, }, results = { - {type="item", name="fu_space_probe_science_item_1", amount=1000}, + {type="item", name="fu_space_probe_science_item_1", amount=200}, }, result_count = 1, - energy_required = 20, + energy_required = 3, }, --crystals { @@ -1092,11 +1089,13 @@ data:extend({ type = 'recipe', enabled = 'false', ingredients = { - {'concrete',60}, - {'el_materials_ALK',60}, + {'concrete',100}, + {'fu_materials_TIM',60}, + {'fu_materials_KFK',60}, + {'fi_materials_GFK',60}, {'iron-gear-wheel',40}, - {'electric-engine-unit',15}, - {'el_energy_crystal_item',20}, + {'laser-turret',2}, + {'fi_energy_crystal_item',100}, }, result = 'fu_laser_item', result_count = 1, @@ -1143,11 +1142,13 @@ data:extend({ type = 'recipe', enabled = 'false', ingredients = { - {'concrete',60}, - {'el_materials_ALK',60}, + {'concrete',100}, + {'fu_materials_TIM',60}, + {'fu_materials_KFK',60}, + {'fi_materials_GFK',60}, {'iron-gear-wheel',40}, - {'electric-engine-unit',15}, - {'el_energy_crystal_item',20}, + {'fi_materials_neodym',60}, + {'electric-furnace',10}, }, result = 'fu_plasma_item', result_count = 1, @@ -1158,11 +1159,13 @@ data:extend({ type = 'recipe', enabled = 'false', ingredients = { - {'concrete',60}, - {'el_materials_ALK',60}, + {'concrete',100}, + {'fu_materials_TIM',60}, + {'fu_materials_KFK',60}, + {'fi_materials_GFK',60}, {'iron-gear-wheel',40}, - {'electric-engine-unit',15}, - {'el_energy_crystal_item',20}, + {'electric-engine-unit',20}, + {'fi_materials_neodym',200}, }, result = 'fu_magnet_item', result_count = 1, @@ -1315,10 +1318,10 @@ data:extend({ }, 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}, + --{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=6}, }, energy_required = 0.2, order = 'a-b', @@ -1355,6 +1358,20 @@ data:extend({ energy_required = 1, order = 'a-b', }, + { + name = 'fu_heat_lead_recipe', + type = 'recipe', + category = 'crafting-with-fluid', + enabled = 'false', + ingredients = { + {type="fluid", name="fu_lead_fluid", amount=100}, + }, + results = { + {type="fluid", name="fu_lead_fluid", amount=100, temperature=500}, + }, + result_count = 1, + energy_required = 6, + }, diff --git a/prototypes/fusion/fu_fusor.lua b/prototypes/fusion/fu_fusor.lua index 9540722..16ae9f4 100644 --- a/prototypes/fusion/fu_fusor.lua +++ b/prototypes/fusion/fu_fusor.lua @@ -16,7 +16,7 @@ data:extend({ icon_size = 64, place_result = 'fu_fusor_entity', stack_size = 20, - subgroup = 'fu_item_subgroup_d', + subgroup = 'fu_item_subgroup_c', order = 'a-a', }, { diff --git a/prototypes/fusion/fu_magnet.lua b/prototypes/fusion/fu_magnet.lua index 5e51d8f..9f8a698 100644 --- a/prototypes/fusion/fu_magnet.lua +++ b/prototypes/fusion/fu_magnet.lua @@ -48,7 +48,7 @@ data:extend({ type = 'electric', usage_priority = 'secondary-input', }, - energy_usage = '20MW', + energy_usage = '60MW', fluid_boxes = { { diff --git a/prototypes/gr_recipes.lua b/prototypes/gr_recipes.lua index e9c244f..437b378 100644 --- a/prototypes/gr_recipes.lua +++ b/prototypes/gr_recipes.lua @@ -92,9 +92,9 @@ data:extend({ enabled = 'false', ingredients = { {type="item", name="gr_materials_fusion_cell_item", amount=4}, - {type="item", name="low-density-structure", amount=100}, + {type="item", name="fu_materials_KFK", amount=100}, {type="item", name="gr_materials_stack_up_item", amount=4}, - {type="item", name="copper-cable", amount=1000}, + {type="item", name="gr_materials_magnet", amount=20}, {type="item", name="gr_magnet_train_pre_item", amount=1}, }, results = { @@ -109,9 +109,9 @@ data:extend({ enabled = 'false', ingredients = { {type="item", name="gr_materials_fusion_cell_item", amount=2}, - {type="item", name="low-density-structure", amount=100}, + {type="item", name="fu_materials_KFK", amount=100}, {type="item", name="gr_materials_stack_down_item", amount=2}, - {type="item", name="copper-cable", amount=1000}, + {type="item", name="gr_materials_magnet", amount=20}, {type="item", name="gr_magnet_wagon_pre_item", amount=1}, }, results = { @@ -126,9 +126,9 @@ data:extend({ enabled = 'false', ingredients = { {type="item", name="gr_materials_fusion_cell_item", amount=2}, - {type="item", name="low-density-structure", amount=100}, + {type="item", name="fu_materials_KFK", amount=100}, {type="item", name="gr_materials_stack_down_item", amount=2}, - {type="item", name="copper-cable", amount=1000}, + {type="item", name="gr_materials_magnet", amount=20}, {type="item", name="gr_magnet_tanker_pre_item", amount=1}, }, results = { @@ -142,10 +142,10 @@ data:extend({ type = 'recipe', enabled = 'false', ingredients = { - {type="item", name="gr_materials_fusion_cell_item", amount=4}, - {type="item", name="low-density-structure", amount=100}, - {type="item", name="iron-plate", amount=100}, - {type="item", name="copper-cable", amount=1000}, + {type="item", name="fu_materials_KFK", amount=100}, + {type="item", name="fu_materials_TIM", amount=100}, + {type="item", name="fu_materials_magnet", amount=100}, + {type="item", name="fu_materials_energy_crystal", amount=100}, {type="item", name="el_diesel_train_item", amount=1}, }, results = { @@ -159,10 +159,10 @@ data:extend({ type = 'recipe', enabled = 'false', ingredients = { - {type="item", name="gr_materials_fusion_cell_item", amount=2}, - {type="item", name="low-density-structure", amount=100}, - {type="item", name="iron-plate", amount=100}, - {type="item", name="copper-cable", amount=1000}, + {type="item", name="fu_materials_KFK", amount=100}, + {type="item", name="fu_materials_TIM", amount=100}, + {type="item", name="fu_materials_magnet", amount=100}, + {type="item", name="fu_materials_energy_crystal", amount=100}, {type="item", name="cargo-wagon", amount=1}, }, results = { @@ -176,10 +176,10 @@ data:extend({ type = 'recipe', enabled = 'false', ingredients = { - {type="item", name="gr_materials_fusion_cell_item", amount=2}, - {type="item", name="low-density-structure", amount=100}, - {type="item", name="iron-plate", amount=100}, - {type="item", name="copper-cable", amount=1000}, + {type="item", name="fu_materials_KFK", amount=100}, + {type="item", name="fu_materials_TIM", amount=100}, + {type="item", name="fu_materials_magnet", amount=100}, + {type="item", name="fu_materials_energy_crystal", amount=100}, {type="item", name="fluid-wagon", amount=1}, }, results = { @@ -206,76 +206,6 @@ data:extend({ energy_required = 100, always_show_made_in = true }, - --cooker - { - name = 'gr_cooker_recipe', - type = 'recipe', - enabled = 'false', - main_product = 'gr_cooker_item', - ingredients = { - {'fi_industrial_steel_item',200}, - {'fi_compound_material_item',200}, - {'processing-unit',100}, - {'pipe',60} - }, - results = { - {type="item", name="gr_cooker_item", amount=1} - }, - result_count = 1, - energy_required = 5 - }, - { - name = 'gr_cooker_fluid_recipe', - type = 'recipe', - category = 'gr_cooker_fluid', - enabled = 'false', - main_product = 'gr_materials_cooked_crystal_item', - ingredients = { - {type="fluid", name="water", amount=1000}, - {type="item", name="fi_crushed_crystal_item", amount=1} - }, - results = { - {type="item", name="gr_materials_cooked_crystal_item", amount=1} - }, - result_count = 1, - energy_required = 60, - always_show_made_in = true - }, - { - name = 'gr_cooked_crystal_recipe', - type = 'recipe', - category = 'chemistry', - enabled = 'false', - main_product = 'gr_materials_refined_crystal_item', - ingredients = { - {type="item", name="gr_materials_cooked_crystal_item", amount=1}, - {type="fluid", name="petroleum-gas", amount=100} - }, - results = { - {type="item", name="gr_materials_refined_crystal_item", amount=1} - }, - result_count = 1, - energy_required = 30, - always_show_made_in = true - }, - { - name = 'gr_refined_crystal_recipe', - type = 'recipe', - category = 'centrifuging', - enabled = 'false', - main_product = 'fi_energy_crystal_item', - subgroup = 'gr_item_subgroup_a', - ingredients = { - {type="item", name="gr_materials_refined_crystal_item", amount=1} - }, - results = { - {type="item", name="fi_energy_crystal_item", amount=1}, - {type="item", name="el_energy_crystal_item", amount=4} - }, - result_count = 1, - energy_required = 10, - always_show_made_in = true - }, --charger { name = 'gr_charger_recipe', @@ -284,12 +214,12 @@ data:extend({ main_product = 'gr_charger_item', ingredients = { {'low-density-structure',100}, - {'fi_industrial_steel_item',400}, - {'fi_compound_material_item',400}, + {'fu_materials_KFK',100}, + {'gr_materials_magnet',100}, {'fu_tech_sign_item',1000}, {'concrete',500}, {'lab',10}, - {'processing-unit',500} + {'gr_materials_circuit',100} }, results = { {type="item", name="gr_charger_item", amount=1} @@ -305,14 +235,14 @@ data:extend({ main_product = 'gr_materials_stabilizer_item', ingredients = { {'gr_materials_crushed_exotic_item',1}, - {'fi_energy_crystal_item',20}, - {'fu_tech_sign_item',100}, + {'fu_materials_energy_crystal',10}, + {'fu_tech_sign_item',10}, }, results = { {type="item", name="gr_materials_stabilizer_item", amount=2} }, result_count = 1, - energy_required = 10, + energy_required = 1, always_show_made_in = true }, { @@ -324,8 +254,8 @@ data:extend({ {'fu_space_probe_ore_item',1}, }, result = 'gr_materials_crushed_exotic_item', - result_count = 1, - energy_required = 20, + result_count = 2, + energy_required = 2, always_show_made_in = true }, { @@ -340,6 +270,7 @@ data:extend({ {'fu_star_engine_cooler_item',1}, {'gr_materials_stack_up_item',40}, {'gr_materials_stack_down_item',40}, + {'gr_materials_magnet',100}, }, result = 'gr_black_hole_item', result_count = 1, @@ -357,6 +288,7 @@ data:extend({ {'fu_star_engine_cooler_item',1}, {'gr_materials_stack_up_item',40}, {'gr_materials_stack_down_item',40}, + {'gr_materials_magnet',100}, }, result = 'gr_white_hole_item', result_count = 1, @@ -370,12 +302,13 @@ data:extend({ {'gr_materials_stack_up_item',10}, {'gr_materials_stack_down_item',10}, {'lab',40}, - {'fi_industrial_steel_item',100}, - {'fi_compound_material_item',100}, + {'fu_materials_KFK',100}, + {'fu_materials_TIM',100}, + {'gr_materials_magnet',100}, }, result = 'gr_lab_item', result_count = 1, - energy_required = 200, + energy_required = 20, }, --endgame @@ -602,7 +535,7 @@ data:extend({ ingredients = { {'gr_materials_crushed_exotic_item',1}, {'gr_materials_stabilizer_item',1}, - {'processing-unit',100}, + {'gr_materials_circuit',20}, {'fi_modules_base_item',10} }, result = 'gr_materials_data_item', @@ -749,4 +682,94 @@ data:extend({ result_count = 1, energy_required = 10, }, + + { + name = 'gr_circuit_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting-with-fluid', + main_product = 'gr_materials_circuit', + ingredients = { + {type="item", name="gr_materials_gold_wire", amount=10}, + {type="item", name="copper-cable", amount=10}, + {type="item", name="gr_materials_pcb", amount=1}, + {type="fluid", name="fi_strong_acid", amount=50}, + }, + results = { + {type="fluid", name="water", amount=50}, + {type="item", name="gr_materials_circuit", amount=1}, + }, + energy_required = 1, + order = 'a-b', + }, + { + name = 'gr_gold_wire_recipe', + type = 'recipe', + enabled = 'false', + ingredients = { + {type="item", name="fi_materials_gold", amount=1}, + }, + results = { + {type="item", name="gr_materials_gold_wire", amount=2}, + }, + energy_required = 1, + order = 'a-b', + }, + { + name = 'gr_pcb_recipe', + type = 'recipe', + enabled = 'false', + category = 'chemistry', + ingredients = { + {type="fluid", name="petroleum-gas", amount=30}, + {type="item", name="fi_materials_glass_fiber", amount=1}, + {type="item", name="fu_materials_carbon_fiber", amount=1}, + {type="item", name="processing-unit", amount=5}, + {type="item", name="plastic-bar", amount=4}, + }, + results = { + {type="item", name="gr_materials_pcb", amount=1}, + }, + energy_required = 2, + order = 'a-b', + always_show_made_in = true + }, + { + name = 'gr_magnet_recipe', + type = 'recipe', + enabled = 'false', + category = 'fu_magnet_category', + main_product = 'gr_materials_magnet', + ingredients = { + {type="fluid", name="fu_lead_fluid", amount=50}, + {type="item", name="gr_materials_plasma_cube", amount=2}, + {type="item", name="fu_materials_magnet", amount=1}, + }, + results = { + {type="fluid", name="fu_lead_fluid", amount=50, temperature=1500}, + {type="item", name="gr_materials_magnet", amount=1}, + }, + energy_required = 2, + order = 'a-b', + always_show_made_in = true + }, + { + name = 'gr_plasma_cube_recipe', + type = 'recipe', + enabled = 'false', + category = 'fu_plasma_category', + main_product = 'gr_materials_plasma_cube', + ingredients = { + {type="fluid", name="fu_lead_fluid", amount=50}, + {type="item", name="fu_materials_KFK", amount=2}, + {type="item", name="fi_materials_gold", amount=1}, + }, + results = { + {type="fluid", name="fu_lead_fluid", amount=50, temperature=1500}, + {type="item", name="gr_materials_plasma_cube", amount=1}, + }, + energy_required = 2, + order = 'a-b', + always_show_made_in = true + }, }) \ No newline at end of file diff --git a/prototypes/gravitation/gr_black_hole.lua b/prototypes/gravitation/gr_black_hole.lua index c8669f1..899e6f2 100644 --- a/prototypes/gravitation/gr_black_hole.lua +++ b/prototypes/gravitation/gr_black_hole.lua @@ -50,7 +50,7 @@ data:extend({ energy_source = { type = "electric", render_no_power_icon = false, - buffer_capacity = "10YJ", + buffer_capacity = "1TJ", usage_priority = "primary-output", max_input_flow = "0W", --drain = "1GW" diff --git a/prototypes/gravitation/gr_lab.lua b/prototypes/gravitation/gr_lab.lua index 8c8817d..27575b3 100644 --- a/prototypes/gravitation/gr_lab.lua +++ b/prototypes/gravitation/gr_lab.lua @@ -29,11 +29,11 @@ data:extend({ type = 'lab', icon = sprite('item.png'), icon_size = 64, - flags = {"player-creation","placeable-neutral"}, + flags = {"player-creation","placeable-neutral","not-rotatable"}, max_health = 300, corpse = 'big-remnants', - collision_box = {{-4,-4},{4,4}}, - selection_box = {{-4,-4},{4,4}}, + collision_box = {{-4,-3.5},{4,3.5}}, + selection_box = {{-4,-3.5},{4,3.5}}, map_color = {r=0, g=0, b=1, a=1}, minable = { mining_time = 1, @@ -64,7 +64,8 @@ data:extend({ scale = 0.6, line_length = 1, frame_count = 1, - animation_speed = 0.1 + animation_speed = 0.1, + shift = {0,-0.2} }, on_animation = { filename = sprite('animation.png'), @@ -72,7 +73,8 @@ data:extend({ scale = 0.6, line_length = 5, frame_count = 5, - animation_speed = 0.1 + animation_speed = 0.1, + shift = {0,-0.2} }, working_sound = { diff --git a/prototypes/gravitation/gr_materials.lua b/prototypes/gravitation/gr_materials.lua index eb3aabd..285ebb5 100644 --- a/prototypes/gravitation/gr_materials.lua +++ b/prototypes/gravitation/gr_materials.lua @@ -16,7 +16,7 @@ data:extend({ icon_size = 64, stack_size = 10, subgroup = 'gr_item_subgroup_a', - order = 'a-c', + order = 'a-c-c', }, { name = 'gr_materials_stack_down_item', @@ -25,7 +25,7 @@ data:extend({ icon_size = 64, stack_size = 100, subgroup = 'gr_item_subgroup_a', - order = 'a-a', + order = 'a-c-b', }, { name = 'gr_materials_stack_up_item', @@ -34,7 +34,7 @@ data:extend({ icon_size = 64, stack_size = 100, subgroup = 'gr_item_subgroup_a', - order = 'a-b', + order = 'a-c-a', }, { name = 'gr_materials_cooked_crystal_item', @@ -402,5 +402,50 @@ data:extend({ order = "c-b", stack_size = 1 }, + { + name = 'gr_materials_circuit', + type = 'item', + icon = sprite('circuit.png'), + icon_size = 64, + stack_size = 500, + subgroup = 'gr_item_subgroup_a', + order = 'a-b', + }, + { + name = 'gr_materials_gold_wire', + type = 'item', + icon = sprite('gold_wire.png'), + icon_size = 64, + stack_size = 200, + subgroup = 'gr_item_subgroup_a', + order = 'a-c', + }, + { + name = 'gr_materials_pcb', + type = 'item', + icon = sprite('pcb.png'), + icon_size = 64, + stack_size = 200, + subgroup = 'gr_item_subgroup_a', + order = 'a-a', + }, + { + name = 'gr_materials_magnet', + type = 'item', + icon = sprite('magnet.png'), + icon_size = 64, + stack_size = 200, + subgroup = 'gr_item_subgroup_a', + order = 'a-a', + }, + { + name = 'gr_materials_plasma_cube', + type = 'item', + icon = sprite('plasma_cube.png'), + icon_size = 64, + stack_size = 200, + subgroup = 'gr_item_subgroup_a', + order = 'a-a', + }, }) \ No newline at end of file diff --git a/prototypes/gravitation/gr_train.lua b/prototypes/gravitation/gr_train.lua index db6020d..b56debd 100644 --- a/prototypes/gravitation/gr_train.lua +++ b/prototypes/gravitation/gr_train.lua @@ -184,7 +184,7 @@ data:extend({ }, working_sound = { sound = { filename ='__base__/sound/train-engine.ogg'}, - apparent_volume = 0.5, + apparent_volume = 0.2, }, vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact-6.ogg", @@ -351,8 +351,8 @@ data:extend({ icon_size = 64, place_result = 'gr_magnet_train_pre_entity', stack_size = 20, - subgroup = 'gr_item_subgroup_b', - order = 'b-a', + subgroup = 'fu_item_subgroup_d', + order = 'e-a', }, { name = 'gr_magnet_wagon_pre_item', @@ -361,8 +361,8 @@ data:extend({ icon_size = 64, place_result = 'gr_magnet_wagon_pre_entity', stack_size = 20, - subgroup = 'gr_item_subgroup_b', - order = 'b-b', + subgroup = 'fu_item_subgroup_d', + order = 'e-b', }, { name = 'gr_magnet_tanker_pre_item', @@ -371,8 +371,8 @@ data:extend({ icon_size = 64, place_result = 'gr_magnet_tanker_pre_entity', stack_size = 20, - subgroup = 'gr_item_subgroup_b', - order = 'b-c', + subgroup = 'fu_item_subgroup_d', + order = 'e-c', }, { name = 'gr_magnet_train_pre_entity', @@ -399,7 +399,7 @@ data:extend({ result = 'gr_magnet_train_pre_item', }, --stats - max_speed = 2, + max_speed = 1.8, max_power = '40kW', braking_force = 1, friction_force = 0.00025, @@ -409,7 +409,18 @@ data:extend({ reversing_power_modifier = 0.5, weight = 10, --burner - energy_source = {type = "void"}, + burner = { + fuel_categories = { + 'nuclear', + 'fi_basic_fuel', + 'fi_advanced_fuel', + 'fi_pure_fuel', + }, + fuel_inventory_size = 3, + burnt_inventory_size = 3, + effectivity = 0.001, + emissions_per_minute = 10, + }, --light front_light = { { @@ -515,7 +526,7 @@ data:extend({ }, working_sound = { sound = { filename ='__base__/sound/train-engine.ogg'}, - apparent_volume = 0.5, + apparent_volume = 0.2, }, vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact-6.ogg", diff --git a/prototypes/gravitation/gr_white_hole.lua b/prototypes/gravitation/gr_white_hole.lua index 2b367dd..865e8ca 100644 --- a/prototypes/gravitation/gr_white_hole.lua +++ b/prototypes/gravitation/gr_white_hole.lua @@ -39,8 +39,7 @@ data:extend({ crafting_speed = 1, energy_source = { type = "electric", - usage_priority = "secondary-input", - drain = "1TW" + usage_priority = "secondary-input" }, energy_usage = "1TW", animation = { diff --git a/ressources/fusion/fu_materials/fu_materials_fusion_card.png b/ressources/fusion/fu_materials/fu_materials_fusion_card.png index 81b1f33..d5b6fd7 100644 Binary files a/ressources/fusion/fu_materials/fu_materials_fusion_card.png 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 index aaf5fc2..cd93c0f 100644 Binary files a/ressources/fusion/fu_materials/fu_materials_laser_card.png and b/ressources/fusion/fu_materials/fu_materials_laser_card.png differ diff --git a/ressources/fusion/fu_materials/fu_materials_magnet_card.png b/ressources/fusion/fu_materials/fu_materials_magnet_card.png index 7833eac..7e68a9d 100644 Binary files a/ressources/fusion/fu_materials/fu_materials_magnet_card.png 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 index 5c1f4b1..affab16 100644 Binary files a/ressources/fusion/fu_materials/fu_materials_plasma_card.png and b/ressources/fusion/fu_materials/fu_materials_plasma_card.png differ diff --git a/ressources/gravitation/gr_cooker/Thumbs.db b/ressources/gravitation/gr_cooker/Thumbs.db deleted file mode 100644 index 97d3f16..0000000 Binary files a/ressources/gravitation/gr_cooker/Thumbs.db and /dev/null differ diff --git a/ressources/gravitation/gr_cooker/gr_cooker_entity_animation.png b/ressources/gravitation/gr_cooker/gr_cooker_entity_animation.png deleted file mode 100644 index bb52467..0000000 Binary files a/ressources/gravitation/gr_cooker/gr_cooker_entity_animation.png and /dev/null differ diff --git a/ressources/gravitation/gr_cooker/gr_cooker_item.png b/ressources/gravitation/gr_cooker/gr_cooker_item.png deleted file mode 100644 index 8e1a743..0000000 Binary files a/ressources/gravitation/gr_cooker/gr_cooker_item.png and /dev/null differ diff --git a/ressources/gravitation/gr_materials/gr_materials_circuit.png b/ressources/gravitation/gr_materials/gr_materials_circuit.png new file mode 100644 index 0000000..3cffa62 Binary files /dev/null and b/ressources/gravitation/gr_materials/gr_materials_circuit.png differ diff --git a/ressources/gravitation/gr_materials/gr_materials_gold_wire.png b/ressources/gravitation/gr_materials/gr_materials_gold_wire.png new file mode 100644 index 0000000..488e81b Binary files /dev/null and b/ressources/gravitation/gr_materials/gr_materials_gold_wire.png differ diff --git a/ressources/gravitation/gr_materials/gr_materials_magnet.png b/ressources/gravitation/gr_materials/gr_materials_magnet.png new file mode 100644 index 0000000..dcd6d1c Binary files /dev/null and b/ressources/gravitation/gr_materials/gr_materials_magnet.png differ diff --git a/ressources/gravitation/gr_materials/gr_materials_pcb.png b/ressources/gravitation/gr_materials/gr_materials_pcb.png new file mode 100644 index 0000000..6b6d99c Binary files /dev/null and b/ressources/gravitation/gr_materials/gr_materials_pcb.png differ diff --git a/ressources/gravitation/gr_materials/gr_materials_plasma_cube.png b/ressources/gravitation/gr_materials/gr_materials_plasma_cube.png new file mode 100644 index 0000000..9f9a0e5 Binary files /dev/null and b/ressources/gravitation/gr_materials/gr_materials_plasma_cube.png differ diff --git a/ressources/gravitation/gr_materials/gr_materials_plastic.png b/ressources/gravitation/gr_materials/gr_materials_plastic.png new file mode 100644 index 0000000..3d022b4 Binary files /dev/null and b/ressources/gravitation/gr_materials/gr_materials_plastic.png differ diff --git a/ressources/techs/gr_circuit_tech.png b/ressources/techs/gr_circuit_tech.png new file mode 100644 index 0000000..35b77cf Binary files /dev/null and b/ressources/techs/gr_circuit_tech.png differ diff --git a/ressources/techs/gr_magnet_tech.png b/ressources/techs/gr_magnet_tech.png new file mode 100644 index 0000000..5835e8c Binary files /dev/null and b/ressources/techs/gr_magnet_tech.png differ diff --git a/ressources/techs/gr_plasma_cube_tech.png b/ressources/techs/gr_plasma_cube_tech.png new file mode 100644 index 0000000..82cae07 Binary files /dev/null and b/ressources/techs/gr_plasma_cube_tech.png differ