diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index ad1c1ec..49bfa0e 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -90,7 +90,7 @@ if settings.startup['PHI-EQ'].value and settings.startup['PHI-EQ-ARMOR'].value t end end - table.insert(data.raw.technology['power-armor-mk2'].effects, {type = 'unlock-recipe', recipe =armor.name}) + table.insert(data.raw.technology['power-armor-mk2'].effects, {type = 'unlock-recipe', recipe = armor.name}) if mods['space-age'] then grid = table.deepcopy(data.raw['equipment-grid']['large-equipment-grid']) @@ -144,7 +144,7 @@ if settings.startup['PHI-EQ'].value and settings.startup['PHI-EQ-ARMOR'].value t end end - table.insert(data.raw.technology['mech-armor'].effects, {type = 'unlock-recipe', recipe =armor.name}) + table.insert(data.raw.technology['mech-armor'].effects, {type = 'unlock-recipe', recipe = armor.name}) end end @@ -583,28 +583,28 @@ if settings.startup['PHI-SA'].value then end data.raw.technology['agriculture'].research_trigger = nil - data.raw.technology['agriculture'].unit = {count = 400, time = 30, ingredients={{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'space-science-pack', 1}}} + data.raw.technology['agriculture'].unit = {count = 400, time = 30, ingredients = {{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'space-science-pack', 1}}} data.raw.technology['yumako'].research_trigger = nil - data.raw.technology['yumako'].unit = {count = 400, time = 30, ingredients={{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'space-science-pack', 1}}} - table.insert(data.raw.technology['yumako'].effects, {type = 'give-item',item= 'yumako-seed', count=10}) + data.raw.technology['yumako'].unit = {count = 400, time = 30, ingredients = {{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'space-science-pack', 1}}} + table.insert(data.raw.technology['yumako'].effects, {type = 'give-item', item = 'yumako-seed', count = 10}) data.raw.technology['jellynut'].research_trigger = nil - data.raw.technology['jellynut'].unit = {count = 400, time = 30, ingredients={{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'space-science-pack', 1}}} - table.insert(data.raw.technology['jellynut'].effects, {type = 'give-item',item= 'jellynut-seed', count=10}) - table.insert(data.raw.technology['biochamber'].effects, {type = 'give-item',item= 'pentapod-egg', count=10}) - data.raw.technology['bacteria-cultivation'].unit = {count = 400, time = 30, ingredients={{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'space-science-pack', 1}}} + data.raw.technology['jellynut'].unit = {count = 400, time = 30, ingredients = {{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'space-science-pack', 1}}} + table.insert(data.raw.technology['jellynut'].effects, {type = 'give-item', item = 'jellynut-seed', count = 10}) + table.insert(data.raw.technology['biochamber'].effects, {type = 'give-item', item = 'pentapod-egg', count = 10}) + data.raw.technology['bacteria-cultivation'].unit = {count = 400, time = 30, ingredients = {{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'space-science-pack', 1}}} data.raw.technology['bacteria-cultivation'].research_trigger = nil - data.raw.technology['heating-tower'].unit = {count = 400, time = 30, ingredients={{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'space-science-pack', 1}}} + data.raw.technology['heating-tower'].unit = {count = 400, time = 30, ingredients = {{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'space-science-pack', 1}}} data.raw.technology['heating-tower'].research_trigger = nil - data.raw.technology['tungsten-carbide'].unit = {count = 400, time = 30, ingredients={{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'space-science-pack', 1}}} + data.raw.technology['tungsten-carbide'].unit = {count = 400, time = 30, ingredients = {{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'space-science-pack', 1}}} data.raw.technology['tungsten-carbide'].research_trigger = nil - data.raw.technology['recycling'].unit = {count = 400, time = 30, ingredients={{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'space-science-pack', 1}}} + data.raw.technology['recycling'].unit = {count = 400, time = 30, ingredients = {{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'space-science-pack', 1}}} data.raw.technology['recycling'].research_trigger = nil - data.raw.technology['lithium-processing'].unit = {count = 400, time = 30, ingredients={{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'space-science-pack', 1}}} + data.raw.technology['lithium-processing'].unit = {count = 400, time = 30, ingredients = {{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'space-science-pack', 1}}} data.raw.technology['lithium-processing'].research_trigger = nil data.raw.technology['promethium-science-pack'].effects = {{type = 'unlock-recipe', recipe = 'promethium-science-pack'}} data.raw.technology['railgun'].prerequisites = {'military-3', 'utility-science-pack'} - data.raw.technology['railgun'].unit = {count = 1000, time = 60, ingredients={{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'military-science-pack', 1}, {'chemical-science-pack', 1}, {'utility-science-pack', 1}}} - table.insert(data.raw.technology['railgun'].effects, {type = 'give-item',item= 'railgun-turret', count=10}) + data.raw.technology['railgun'].unit = {count = 1000, time = 60, ingredients = {{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'military-science-pack', 1}, {'chemical-science-pack', 1}, {'utility-science-pack', 1}}} + table.insert(data.raw.technology['railgun'].effects, {type = 'give-item', item = 'railgun-turret', count = 10}) for k, v in pairs(items['space-age']['technology_1']) do if data.raw.technology[k] then @@ -793,7 +793,7 @@ if settings.startup['PHI-SA'].value then v.mass = 1 for _, v2 in pairs(v.resistances) do - v2.percent = (v2.percent > 98 and v2.percent = 98) or v2.percent + v2.percent = (v2.percent > 98 and 98) or v2.percent end end @@ -803,52 +803,52 @@ if settings.startup['PHI-SA'].value then local pb = { has_promethium_asteroids = true, probability_on_range_chunk = { - {position=0.001, probability=0.0312, angle_when_stopped=asteroid_util.chunk_angle}, - {position=0.199, probability=0.0281, angle_when_stopped=asteroid_util.chunk_angle}, - {position=0.399, probability=0.0250, angle_when_stopped=asteroid_util.chunk_angle}, - {position=0.599, probability=0.0219, angle_when_stopped=asteroid_util.chunk_angle}, - {position=0.799, probability=0.0188, angle_when_stopped=asteroid_util.chunk_angle}, - {position=0.999, probability=0.0156, angle_when_stopped=asteroid_util.chunk_angle} + {position = 0.001, probability = 0.0312, angle_when_stopped = asteroid_util.chunk_angle}, + {position = 0.199, probability = 0.0281, angle_when_stopped = asteroid_util.chunk_angle}, + {position = 0.399, probability = 0.0250, angle_when_stopped = asteroid_util.chunk_angle}, + {position = 0.599, probability = 0.0219, angle_when_stopped = asteroid_util.chunk_angle}, + {position = 0.799, probability = 0.0188, angle_when_stopped = asteroid_util.chunk_angle}, + {position = 0.999, probability = 0.0156, angle_when_stopped = asteroid_util.chunk_angle} }, probability_on_range_small = { - {position=0.001, probability=0.0273, angle_when_stopped=asteroid_util.small_angle}, - {position=0.199, probability=0.0258, angle_when_stopped=asteroid_util.small_angle}, - {position=0.399, probability=0.0242, angle_when_stopped=asteroid_util.small_angle}, - {position=0.599, probability=0.0227, angle_when_stopped=asteroid_util.small_angle}, - {position=0.799, probability=0.0211, angle_when_stopped=asteroid_util.small_angle}, - {position=0.999, probability=0.0195, angle_when_stopped=asteroid_util.small_angle} + {position = 0.001, probability = 0.0273, angle_when_stopped = asteroid_util.small_angle}, + {position = 0.199, probability = 0.0258, angle_when_stopped = asteroid_util.small_angle}, + {position = 0.399, probability = 0.0242, angle_when_stopped = asteroid_util.small_angle}, + {position = 0.599, probability = 0.0227, angle_when_stopped = asteroid_util.small_angle}, + {position = 0.799, probability = 0.0211, angle_when_stopped = asteroid_util.small_angle}, + {position = 0.999, probability = 0.0195, angle_when_stopped = asteroid_util.small_angle} }, probability_on_range_medium = { - {position=0.001, probability=0.0234, angle_when_stopped=asteroid_util.medium_angle}, - {position=0.199, probability=0.0234, angle_when_stopped=asteroid_util.medium_angle}, - {position=0.399, probability=0.0234, angle_when_stopped=asteroid_util.medium_angle}, - {position=0.599, probability=0.0234, angle_when_stopped=asteroid_util.medium_angle}, - {position=0.799, probability=0.0234, angle_when_stopped=asteroid_util.medium_angle}, - {position=0.999, probability=0.0234, angle_when_stopped=asteroid_util.medium_angle} + {position = 0.001, probability = 0.0234, angle_when_stopped = asteroid_util.medium_angle}, + {position = 0.199, probability = 0.0234, angle_when_stopped = asteroid_util.medium_angle}, + {position = 0.399, probability = 0.0234, angle_when_stopped = asteroid_util.medium_angle}, + {position = 0.599, probability = 0.0234, angle_when_stopped = asteroid_util.medium_angle}, + {position = 0.799, probability = 0.0234, angle_when_stopped = asteroid_util.medium_angle}, + {position = 0.999, probability = 0.0234, angle_when_stopped = asteroid_util.medium_angle} }, probability_on_range_big = { - {position=0.001, probability=0.0195, angle_when_stopped=asteroid_util.big_angle}, - {position=0.199, probability=0.0211, angle_when_stopped=asteroid_util.big_angle}, - {position=0.399, probability=0.0227, angle_when_stopped=asteroid_util.big_angle}, - {position=0.599, probability=0.0242, angle_when_stopped=asteroid_util.big_angle}, - {position=0.799, probability=0.0258, angle_when_stopped=asteroid_util.big_angle}, - {position=0.999, probability=0.0273, angle_when_stopped=asteroid_util.big_angle} + {position = 0.001, probability = 0.0195, angle_when_stopped = asteroid_util.big_angle}, + {position = 0.199, probability = 0.0211, angle_when_stopped = asteroid_util.big_angle}, + {position = 0.399, probability = 0.0227, angle_when_stopped = asteroid_util.big_angle}, + {position = 0.599, probability = 0.0242, angle_when_stopped = asteroid_util.big_angle}, + {position = 0.799, probability = 0.0258, angle_when_stopped = asteroid_util.big_angle}, + {position = 0.999, probability = 0.0273, angle_when_stopped = asteroid_util.big_angle} }, probability_on_range_huge = { - {position=0.001, probability=0.0156, angle_when_stopped=asteroid_util.huge_angle}, - {position=0.199, probability=0.0188, angle_when_stopped=asteroid_util.huge_angle}, - {position=0.399, probability=0.0219, angle_when_stopped=asteroid_util.huge_angle}, - {position=0.599, probability=0.0250, angle_when_stopped=asteroid_util.huge_angle}, - {position=0.799, probability=0.0281, angle_when_stopped=asteroid_util.huge_angle}, - {position=0.999, probability=0.0312, angle_when_stopped=asteroid_util.huge_angle} + {position = 0.001, probability = 0.0156, angle_when_stopped = asteroid_util.huge_angle}, + {position = 0.199, probability = 0.0188, angle_when_stopped = asteroid_util.huge_angle}, + {position = 0.399, probability = 0.0219, angle_when_stopped = asteroid_util.huge_angle}, + {position = 0.599, probability = 0.0250, angle_when_stopped = asteroid_util.huge_angle}, + {position = 0.799, probability = 0.0281, angle_when_stopped = asteroid_util.huge_angle}, + {position = 0.999, probability = 0.0312, angle_when_stopped = asteroid_util.huge_angle} }, type_ratios = { - {position=0.001, ratios={1, 1, 1, 1}}, - {position=0.199, ratios={1, 1, 1, 1}}, - {position=0.399, ratios={1, 1, 1, 1}}, - {position=0.599, ratios={1, 1, 1, 1}}, - {position=0.799, ratios={1, 1, 1, 1}}, - {position=0.999, ratios={1, 1, 1, 1}} + {position = 0.001, ratios = {1, 1, 1, 1}}, + {position = 0.199, ratios = {1, 1, 1, 1}}, + {position = 0.399, ratios = {1, 1, 1, 1}}, + {position = 0.599, ratios = {1, 1, 1, 1}}, + {position = 0.799, ratios = {1, 1, 1, 1}}, + {position = 0.999, ratios = {1, 1, 1, 1}} } } @@ -900,14 +900,14 @@ if settings.startup['PHI-SA'].value then local recipe = table.deepcopy(data.raw.recipe['cliff-explosives']) recipe.name = 'cliff-explosives-o' recipe.ingredients = { - {type = 'item', name = 'explosives', amount =10}, - {type = 'item', name = 'grenade', amount =1}, - {type = 'item', name = 'barrel', amount =1} + {type = 'item', name = 'explosives', amount = 10}, + {type = 'item', name = 'grenade', amount = 1}, + {type = 'item', name = 'barrel', amount = 1} } recipe.localised_name = {'phi-cl.combine', '', ''} data:extend({recipe}) - table.insert(data.raw.technology['cliff-explosives'].effects, {type = 'unlock-recipe', recipe =recipe.name}) + table.insert(data.raw.technology['cliff-explosives'].effects, {type = 'unlock-recipe', recipe = recipe.name}) data.raw.technology['artillery'].prerequisites = {'military-4', 'tank', 'concrete', 'radar'} data.raw.technology['artillery'].unit.count = 2000 @@ -927,27 +927,27 @@ if settings.startup['PHI-SA'].value then recipe = table.deepcopy(data.raw.recipe['artillery-turret']) recipe.name = 'artillery-turret-o' recipe.ingredients = { - {type = 'item', name = 'steel-plate', amount =60}, - {type = 'item', name = 'concrete', amount =60}, - {type = 'item', name = 'iron-gear-wheel', amount =40}, - {type = 'item', name = 'advanced-circuit', amount =20} + {type = 'item', name = 'steel-plate', amount = 60}, + {type = 'item', name = 'concrete', amount = 60}, + {type = 'item', name = 'iron-gear-wheel', amount = 40}, + {type = 'item', name = 'advanced-circuit', amount = 20} } recipe.localised_name = {'phi-cl.combine', '', ''} data:extend({recipe}) - table.insert(data.raw.technology['artillery'].effects, {type = 'unlock-recipe', recipe =recipe.name}) + table.insert(data.raw.technology['artillery'].effects, {type = 'unlock-recipe', recipe = recipe.name}) recipe = table.deepcopy(data.raw.recipe['artillery-shell']) recipe.name = 'artillery-shell-o' recipe.ingredients = { - {type = 'item', name = 'explosive-cannon-shell', amount =4}, - {type = 'item', name = 'radar', amount =1}, - {type = 'item', name = 'explosives', amount =8} + {type = 'item', name = 'explosive-cannon-shell', amount = 4}, + {type = 'item', name = 'radar', amount = 1}, + {type = 'item', name = 'explosives', amount = 8} } recipe.localised_name = {'phi-cl.combine', '', ''} data:extend({recipe}) - table.insert(data.raw.technology['artillery'].effects, {type = 'unlock-recipe', recipe =recipe.name}) + table.insert(data.raw.technology['artillery'].effects, {type = 'unlock-recipe', recipe = recipe.name}) recipe = table.deepcopy(data.raw.recipe['artillery-wagon']) recipe.name = 'artillery-wagon-o' @@ -961,7 +961,7 @@ if settings.startup['PHI-SA'].value then recipe.localised_name = {'phi-cl.combine', '', ''} data:extend({recipe}) - table.insert(data.raw.technology['artillery'].effects, {type = 'unlock-recipe', recipe =recipe.name}) + table.insert(data.raw.technology['artillery'].effects, {type = 'unlock-recipe', recipe = recipe.name}) data.raw.technology['rail-support-foundations'].prerequisites = {'elevated-rail'} data.raw.technology['rail-support-foundations'].unit.count = 600 @@ -986,17 +986,17 @@ if settings.startup['PHI-SA'].value then recipe = table.deepcopy(data.raw.recipe['foundation']) recipe.name = 'foundation-o' recipe.ingredients = { - {type = 'item', name = 'stone', amount =40}, - {type = 'item', name = 'refined-concrete', amount =20}, - {type = 'item', name = 'steel-plate', amount =20} + {type = 'item', name = 'stone', amount = 40}, + {type = 'item', name = 'refined-concrete', amount = 20}, + {type = 'item', name = 'steel-plate', amount = 20} } recipe.results = { - {type = 'item', name = 'foundation', amount =10} + {type = 'item', name = 'foundation', amount = 10} } recipe.localised_name = {'phi-cl.combine', '', ''} data:extend({recipe}) - table.insert(data.raw.technology['foundation'].effects, {type = 'unlock-recipe', recipe =recipe.name}) + table.insert(data.raw.technology['foundation'].effects, {type = 'unlock-recipe', recipe = recipe.name}) data.raw['space-platform-hub']['space-platform-hub'].platform_repair_speed_modifier = 2 data.raw['space-platform-hub']['space-platform-hub'].inventory_size = 119 @@ -1013,8 +1013,8 @@ if settings.startup['PHI-SA'].value then data.raw.recipe['atomic-bomb'].ingredients[3] = {type = 'item', name = 'uranium-235', amount =30} - table.insert(data.raw['thruster']['thruster'].fuel_fluid_box.pipe_connections, {flow_direction= 'input-output', direction=defines.direction.west, position={-1.5, 2}}) - table.insert(data.raw['thruster']['thruster'].oxidizer_fluid_box.pipe_connections, {flow_direction= 'input-output', direction=defines.direction.east, position={1.5, 2}}) + table.insert(data.raw['thruster']['thruster'].fuel_fluid_box.pipe_connections, {flow_direction = 'input-output', direction = defines.direction.west, position = {-1.5, 2}}) + table.insert(data.raw['thruster']['thruster'].oxidizer_fluid_box.pipe_connections, {flow_direction = 'input-output', direction = defines.direction.east, position = {1.5, 2}}) data.raw['roboport']['roboport'].charging_station_count_affected_by_quality = true data.raw['roboport-equipment']['personal-roboport-equipment'].charging_station_count_affected_by_quality = true @@ -1150,7 +1150,7 @@ if settings.startup['PHI-SA'].value then drop_sound = item_sounds.mechanical_inventory_move, stack_size = 1, weight = 1 * tons, - rocket_launch_products = {{type = 'item', name = 'space-science-pack', amount =1000}}, + rocket_launch_products = {{type = 'item', name = 'space-science-pack', amount = 1000}}, send_to_orbit_mode = 'automated' }, { @@ -1159,16 +1159,15 @@ if settings.startup['PHI-SA'].value then energy_required = 5, enabled = false, category = 'crafting', - ingredients = - { - {type = 'item', name = 'low-density-structure', amount =100}, - {type = 'item', name = 'solar-panel', amount =100}, - {type = 'item', name = 'accumulator', amount =100}, - {type = 'item', name = 'radar', amount =5}, - {type = 'item', name = 'processing-unit', amount =100}, - {type = 'item', name = 'rocket-fuel', amount =50} + ingredients = { + {type = 'item', name = 'low-density-structure', amount = 100}, + {type = 'item', name = 'solar-panel', amount = 100}, + {type = 'item', name = 'accumulator', amount = 100}, + {type = 'item', name = 'radar', amount = 5}, + {type = 'item', name = 'processing-unit', amount = 100}, + {type = 'item', name = 'rocket-fuel', amount = 50} }, - results = {{type = 'item', name = 'satellite', amount =1}}, + results = {{type = 'item', name = 'satellite', amount = 1}}, requester_paste_multiplier = 1 } }) @@ -1176,7 +1175,7 @@ if settings.startup['PHI-SA'].value then data.raw.technology['space-science-pack'].research_trigger = nil data.raw.technology['space-science-pack'].prerequisites = {'rocket-silo'} data.raw.technology['space-science-pack'].effects = {{type = 'unlock-recipe', recipe = 'satellite'}} - data.raw.technology['space-science-pack'].unit = {count = 400, time = 30, ingredients={{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}}} + data.raw.technology['space-science-pack'].unit = {count = 400, time = 30, ingredients = {{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}}} for _, v in pairs({'calcite', 'fluorine_vent', 'lithium_brine', 'scrap', 'tungsten_ore'}) do data.raw.planet['nauvis'].map_gen_settings.autoplace_controls[v] = nil @@ -1194,7 +1193,7 @@ if settings.startup['PHI-SA'].value then data.raw.recipe['landfill'].ingredients = {{type = 'item', name = 'stone', amount =20}} end - data.raw.technology['space-science-pack'].unit = {count = 2000, time = 30, ingredients={{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'production-science-pack', 1}, {'utility-science-pack', 1}}} + data.raw.technology['space-science-pack'].unit = {count = 2000, time = 30, ingredients = {{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'production-science-pack', 1}, {'utility-science-pack', 1}}} data.raw.technology['cliff-explosives'].effects = {{type = 'unlock-recipe', recipe = 'cliff-explosives'}, {type = 'cliff-deconstruction-enabled', modifier = true}} data.raw.technology['logistic-system'].prerequisites = {'logistic-robotics'} data.raw.technology['logistic-system'].unit.ingredients = {{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'utility-science-pack', 1}} @@ -1244,7 +1243,7 @@ if settings.startup['PHI-SA'].value then data.raw.technology['toolbelt-equipment'].prerequisites = {'power-armor', 'toolbelt'} data.raw.technology['toolbelt-equipment'].unit.ingredients = {{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}} data.raw.technology['big-mining-drill'].prerequisites = {'electric-mining-drill', 'automation-3'} - data.raw.technology['big-mining-drill'].unit = {count = 800, time = 30, ingredients={{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'production-science-pack', 1}}} + data.raw.technology['big-mining-drill'].unit = {count = 800, time = 30, ingredients = {{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'production-science-pack', 1}}} data.raw.technology['big-mining-drill'].research_trigger = nil data.raw.technology['turbo-transport-belt'].prerequisites = {'logistics-3'} data.raw.technology['railgun'].prerequisites = {'military-4'} @@ -1256,13 +1255,13 @@ if settings.startup['PHI-SA'].value then data.raw.technology['research-productivity'].prerequisites = {'space-science-pack'} data.raw.technology['processing-unit-productivity'].prerequisites = {'processing-unit'} data.raw.technology['steel-plate-productivity'].prerequisites = {'steel-processing'} - data.raw.technology['steel-plate-productivity'].effects = {{type = 'change-recipe-productivity', recipe = 'steel-plate', change=0.1}} + data.raw.technology['steel-plate-productivity'].effects = {{type = 'change-recipe-productivity', recipe = 'steel-plate', change = 0.1}} data.raw.technology['low-density-structure-productivity'].prerequisites = {'low-density-structure'} - data.raw.technology['low-density-structure-productivity'].effects = {{type = 'change-recipe-productivity', recipe = 'low-density-structure', change=0.1}} + data.raw.technology['low-density-structure-productivity'].effects = {{type = 'change-recipe-productivity', recipe = 'low-density-structure', change = 0.1}} data.raw.technology['plastic-bar-productivity'].prerequisites = {'plastics'} - data.raw.technology['plastic-bar-productivity'].effects = {{type = 'change-recipe-productivity', recipe = 'plastic-bar', change=0.1}} + data.raw.technology['plastic-bar-productivity'].effects = {{type = 'change-recipe-productivity', recipe = 'plastic-bar', change = 0.1}} data.raw.technology['rocket-fuel-productivity'].prerequisites = {'rocket-fuel'} - data.raw.technology['rocket-fuel-productivity'].effects = {{type = 'change-recipe-productivity', recipe = 'rocket-fuel', change=0.1}} + data.raw.technology['rocket-fuel-productivity'].effects = {{type = 'change-recipe-productivity', recipe = 'rocket-fuel', change = 0.1}} data.raw.technology['rocket-part-productivity'].prerequisites = {'rocket-silo'} for _, v in pairs(data.raw.technology) do @@ -1297,54 +1296,54 @@ if settings.startup['PHI-SA'].value then data.raw.recipe['cliff-explosives-o'] = nil data.raw.recipe['big-mining-drill'].category = nil - data.raw.recipe['big-mining-drill'].ingredients = {{type = 'item', name = 'electric-mining-drill', amount =1}, {type = 'item', name = 'steel-plate', amount =20}, {type = 'item', name = 'electric-engine-unit', amount =10}, {type = 'item', name = 'advanced-circuit', amount =10}} + data.raw.recipe['big-mining-drill'].ingredients = {{type = 'item', name = 'electric-mining-drill', amount = 1}, {type = 'item', name = 'steel-plate', amount =20}, {type = 'item', name = 'electric-engine-unit', amount =10}, {type = 'item', name = 'advanced-circuit', amount =10}} data.raw.recipe['turbo-transport-belt'].category = 'crafting-with-fluid' - data.raw.recipe['turbo-transport-belt'].ingredients = {{type = 'item', name = 'steel-plate', amount =5}, {type = 'item', name = 'express-transport-belt', amount =1}, {type = 'fluid', name = 'lubricant', amount =20}} + data.raw.recipe['turbo-transport-belt'].ingredients = {{type = 'item', name = 'steel-plate', amount = 5}, {type = 'item', name = 'express-transport-belt', amount =1}, {type = 'fluid', name = 'lubricant', amount =20}} data.raw.recipe['turbo-underground-belt'].category = 'crafting-with-fluid' - data.raw.recipe['turbo-underground-belt'].ingredients = {{type = 'item', name = 'steel-plate', amount =40}, {type = 'item', name = 'express-underground-belt', amount =2}, {type = 'fluid', name = 'lubricant', amount =40}} + data.raw.recipe['turbo-underground-belt'].ingredients = {{type = 'item', name = 'steel-plate', amount = 40}, {type = 'item', name = 'express-underground-belt', amount =2}, {type = 'fluid', name = 'lubricant', amount =40}} data.raw.recipe['turbo-splitter'].category = 'crafting-with-fluid' - data.raw.recipe['turbo-splitter'].ingredients = {{type = 'item', name = 'steel-plate', amount =15}, {type = 'item', name = 'processing-unit', amount =2}, {type = 'item', name = 'express-splitter', amount =1}, {type = 'fluid', name = 'lubricant', amount =80}} + data.raw.recipe['turbo-splitter'].ingredients = {{type = 'item', name = 'steel-plate', amount = 15}, {type = 'item', name = 'processing-unit', amount =2}, {type = 'item', name = 'express-splitter', amount =1}, {type = 'fluid', name = 'lubricant', amount =80}} data.raw.recipe['express-transport-belt'].category = 'crafting-with-fluid' data.raw.recipe['express-underground-belt'].category = 'crafting-with-fluid' data.raw.recipe['express-splitter'].category = 'crafting-with-fluid' - data.raw.recipe['stack-inserter'].ingredients = {{type = 'item', name = 'processing-unit', amount =1}, {type = 'item', name = 'steel-plate', amount =2}, {type = 'item', name = 'bulk-inserter', amount =1}} - data.raw.recipe['speed-module-3'].ingredients = {{type = 'item', name = 'advanced-circuit', amount =5}, {type = 'item', name = 'processing-unit', amount =5}, {type = 'item', name = 'speed-module-2', amount =4}} - data.raw.recipe['productivity-module-3'].ingredients = {{type = 'item', name = 'advanced-circuit', amount =5}, {type = 'item', name = 'processing-unit', amount =5}, {type = 'item', name = 'productivity-module-2', amount =4}} - data.raw.recipe['efficiency-module-3'].ingredients = {{type = 'item', name = 'advanced-circuit', amount =5}, {type = 'item', name = 'processing-unit', amount =5}, {type = 'item', name = 'efficiency-module-2', amount =4}} - data.raw.recipe['toolbelt-equipment'].ingredients = {{type = 'item', name = 'advanced-circuit', amount =3}, {type = 'item', name = 'steel-plate', amount =4}} - data.raw.recipe['power-armor-mk2'].ingredients = {{type = 'item', name = 'efficiency-module-2', amount =25}, {type = 'item', name = 'speed-module-2', amount =25}, {type = 'item', name = 'processing-unit', amount =60}, {type = 'item', name = 'electric-engine-unit', amount =40}, {type = 'item', name = 'low-density-structure', amount =30}} - data.raw.recipe['personal-roboport-mk2-equipment'].ingredients = {{type = 'item', name = 'personal-roboport-equipment', amount =5}, {type = 'item', name = 'processing-unit', amount =100}, {type = 'item', name = 'low-density-structure', amount =20}} - data.raw.recipe['battery-mk3-equipment'].ingredients = {{type = 'item', name = 'battery-mk2-equipment', amount =5}, {type = 'item', name = 'battery', amount =20}} - data.raw.recipe['artillery-turret'].ingredients = {{type = 'item', name = 'steel-plate', amount =60}, {type = 'item', name = 'concrete', amount =60}, {type = 'item', name = 'iron-gear-wheel', amount =40}, {type = 'item', name = 'advanced-circuit', amount =20}} - data.raw.recipe['artillery-wagon'].ingredients = {{type = 'item', name = 'engine-unit', amount =64}, {type = 'item', name = 'iron-gear-wheel', amount =10}, {type = 'item', name = 'steel-plate', amount =40}, {type = 'item', name = 'pipe', amount =16}, {type = 'item', name = 'advanced-circuit', amount =20}} - data.raw.recipe['artillery-shell'].ingredients = {{type = 'item', name = 'explosive-cannon-shell', amount =4}, {type = 'item', name = 'radar', amount =1}, {type = 'item', name = 'explosives', amount =8}} - data.raw.recipe['cliff-explosives'].ingredients = {{type = 'item', name = 'explosives', amount =10}, {type = 'item', name = 'grenade', amount =1}, {type = 'item', name = 'barrel', amount =1}} + data.raw.recipe['stack-inserter'].ingredients = {{type = 'item', name = 'processing-unit', amount = 1}, {type = 'item', name = 'steel-plate', amount = 2}, {type = 'item', name = 'bulk-inserter', amount = 1}} + data.raw.recipe['speed-module-3'].ingredients = {{type = 'item', name = 'advanced-circuit', amount = 5}, {type = 'item', name = 'processing-unit', amount = 5}, {type = 'item', name = 'speed-module-2', amount = 4}} + data.raw.recipe['productivity-module-3'].ingredients = {{type = 'item', name = 'advanced-circuit', amount = 5}, {type = 'item', name = 'processing-unit', amount = 5}, {type = 'item', name = 'productivity-module-2', amount = 4}} + data.raw.recipe['efficiency-module-3'].ingredients = {{type = 'item', name = 'advanced-circuit', amount = 5}, {type = 'item', name = 'processing-unit', amount = 5}, {type = 'item', name = 'efficiency-module-2', amount = 4}} + data.raw.recipe['toolbelt-equipment'].ingredients = {{type = 'item', name = 'advanced-circuit', amount = 3}, {type = 'item', name = 'steel-plate', amount = 4}} + data.raw.recipe['power-armor-mk2'].ingredients = {{type = 'item', name = 'efficiency-module-2', amount = 25}, {type = 'item', name = 'speed-module-2', amount = 25}, {type = 'item', name = 'processing-unit', amount = 60}, {type = 'item', name = 'electric-engine-unit', amount = 40}, {type = 'item', name = 'low-density-structure', amount = 30}} + data.raw.recipe['personal-roboport-mk2-equipment'].ingredients = {{type = 'item', name = 'personal-roboport-equipment', amount = 5}, {type = 'item', name = 'processing-unit', amount = 100}, {type = 'item', name = 'low-density-structure', amount = 20}} + data.raw.recipe['battery-mk3-equipment'].ingredients = {{type = 'item', name = 'battery-mk2-equipment', amount = 5}, {type = 'item', name = 'battery', amount = 20}} + data.raw.recipe['artillery-turret'].ingredients = {{type = 'item', name = 'steel-plate', amount = 60}, {type = 'item', name = 'concrete', amount = 60}, {type = 'item', name = 'iron-gear-wheel', amount = 40}, {type = 'item', name = 'advanced-circuit', amount = 20}} + data.raw.recipe['artillery-wagon'].ingredients = {{type = 'item', name = 'engine-unit', amount = 64}, {type = 'item', name = 'iron-gear-wheel', amount = 10}, {type = 'item', name = 'steel-plate', amount = 40}, {type = 'item', name = 'pipe', amount = 16}, {type = 'item', name = 'advanced-circuit', amount = 20}} + data.raw.recipe['artillery-shell'].ingredients = {{type = 'item', name = 'explosive-cannon-shell', amount = 4}, {type = 'item', name = 'radar', amount = 1}, {type = 'item', name = 'explosives', amount = 8}} + data.raw.recipe['cliff-explosives'].ingredients = {{type = 'item', name = 'explosives', amount = 10}, {type = 'item', name = 'grenade', amount = 1}, {type = 'item', name = 'barrel', amount = 1}} data.raw.recipe['tesla-ammo'].category = 'crafting-with-fluid' - data.raw.recipe['tesla-ammo'].ingredients = {{type = 'item', name = 'battery', amount =1}, {type = 'item', name = 'plastic-bar', amount =1}, {type = 'fluid', name = 'sulfuric-acid', amount =10}} + data.raw.recipe['tesla-ammo'].ingredients = {{type = 'item', name = 'battery', amount = 1}, {type = 'item', name = 'plastic-bar', amount = 1}, {type = 'fluid', name = 'sulfuric-acid', amount = 10}} data.raw.recipe['teslagun'].category = 'crafting-with-fluid' - data.raw.recipe['teslagun'].ingredients = {{type = 'item', name = 'steel-plate', amount =10}, {type = 'item', name = 'processing-unit', amount =10}, {type = 'item', name = 'plastic-bar', amount =1}, {type = 'fluid', name = 'sulfuric-acid', amount =100}} + data.raw.recipe['teslagun'].ingredients = {{type = 'item', name = 'steel-plate', amount = 10}, {type = 'item', name = 'processing-unit', amount = 10}, {type = 'item', name = 'plastic-bar', amount = 1}, {type = 'fluid', name = 'sulfuric-acid', amount = 100}} data.raw.recipe['tesla-turret'].category = 'crafting-with-fluid' - data.raw.recipe['tesla-turret'].ingredients = {{type = 'item', name = 'teslagun', amount =1}, {type = 'item', name = 'steel-plate', amount =10}, {type = 'item', name = 'processing-unit', amount =10}, {type = 'fluid', name = 'sulfuric-acid', amount =500}} - data.raw.recipe['mech-armor'].ingredients = {{type = 'item', name = 'power-armor-mk2', amount =1}, {type = 'item', name = 'processing-unit', amount =100}, {type = 'item', name = 'steel-plate', amount =200}, {type = 'item', name = 'battery', amount =50}} + data.raw.recipe['tesla-turret'].ingredients = {{type = 'item', name = 'teslagun', amount = 1}, {type = 'item', name = 'steel-plate', amount = 10}, {type = 'item', name = 'processing-unit', amount = 10}, {type = 'fluid', name = 'sulfuric-acid', amount = 500}} + data.raw.recipe['mech-armor'].ingredients = {{type = 'item', name = 'power-armor-mk2', amount = 1}, {type = 'item', name = 'processing-unit', amount = 100}, {type = 'item', name = 'steel-plate', amount = 200}, {type = 'item', name = 'battery', amount = 50}} data.raw.recipe['railgun'].category = 'crafting-with-fluid' - data.raw.recipe['railgun'].ingredients = {{type = 'item', name = 'steel-plate', amount =10}, {type = 'item', name = 'processing-unit', amount =20}, {type = 'item', name = 'battery', amount =10}, {type = 'fluid', name = 'sulfuric-acid', amount =10}} + data.raw.recipe['railgun'].ingredients = {{type = 'item', name = 'steel-plate', amount = 10}, {type = 'item', name = 'processing-unit', amount = 20}, {type = 'item', name = 'battery', amount = 10}, {type = 'fluid', name = 'sulfuric-acid', amount = 10}} data.raw.recipe['railgun-turret'].category = 'crafting-with-fluid' - data.raw.recipe['railgun-turret'].ingredients = {{type = 'item', name = 'steel-plate', amount =30}, {type = 'item', name = 'processing-unit', amount =50}, {type = 'item', name = 'battery', amount =50}, {type = 'fluid', name = 'sulfuric-acid', amount =100}} + data.raw.recipe['railgun-turret'].ingredients = {{type = 'item', name = 'steel-plate', amount = 30}, {type = 'item', name = 'processing-unit', amount = 50}, {type = 'item', name = 'battery', amount = 50}, {type = 'fluid', name = 'sulfuric-acid', amount = 100}} data.raw.recipe['rocket-turret'].category = 'crafting' - data.raw.recipe['rocket-turret'].ingredients = {{type = 'item', name = 'rocket-launcher', amount =4}, {type = 'item', name = 'steel-plate', amount =40}, {type = 'item', name = 'processing-unit', amount =4}, {type = 'item', name = 'iron-gear-wheel', amount =20}} + data.raw.recipe['rocket-turret'].ingredients = {{type = 'item', name = 'rocket-launcher', amount = 4}, {type = 'item', name = 'steel-plate', amount = 40}, {type = 'item', name = 'processing-unit', amount = 4}, {type = 'item', name = 'iron-gear-wheel', amount = 20}} data.raw.recipe['fusion-reactor'].category = 'crafting' - data.raw.recipe['fusion-reactor'].ingredients = {{type = 'item', name = 'nuclear-reactor', amount =1}, {type = 'item', name = 'steel-plate', amount =200}, {type = 'item', name = 'processing-unit', amount =450}} + data.raw.recipe['fusion-reactor'].ingredients = {{type = 'item', name = 'nuclear-reactor', amount = 1}, {type = 'item', name = 'steel-plate', amount = 200}, {type = 'item', name = 'processing-unit', amount = 450}} data.raw.recipe['fusion-generator'].category = 'crafting' - data.raw.recipe['fusion-generator'].ingredients = {{type = 'item', name = 'steam-turbine', amount =1}, {type = 'item', name = 'steel-plate', amount =100}, {type = 'item', name = 'processing-unit', amount =150}} + data.raw.recipe['fusion-generator'].ingredients = {{type = 'item', name = 'steam-turbine', amount = 1}, {type = 'item', name = 'steel-plate', amount = 100}, {type = 'item', name = 'processing-unit', amount = 150}} data.raw.recipe['fusion-power-cell'].category = 'crafting-with-fluid' - data.raw.recipe['fusion-power-cell'].ingredients = {{type = 'item', name = 'steel-plate', amount =5}, {type = 'fluid', name = 'petroleum-gas', amount =100}} + data.raw.recipe['fusion-power-cell'].ingredients = {{type = 'item', name = 'steel-plate', amount = 5}, {type = 'fluid', name = 'petroleum-gas', amount = 100}} data.raw.recipe['fusion-reactor-equipment'].category = 'crafting' - data.raw.recipe['fusion-reactor-equipment'].ingredients = {{type = 'item', name = 'fission-reactor-equipment', amount =1}, {type = 'item', name = 'fusion-power-cell', amount =10}, {type = 'item', name = 'steel-plate', amount =350}, {type = 'item', name = 'processing-unit', amount =275}} + data.raw.recipe['fusion-reactor-equipment'].ingredients = {{type = 'item', name = 'fission-reactor-equipment', amount = 1}, {type = 'item', name = 'fusion-power-cell', amount = 10}, {type = 'item', name = 'steel-plate', amount = 350}, {type = 'item', name = 'processing-unit', amount = 275}} data.raw.recipe['fluoroketone'].category = 'chemistry' - data.raw.recipe['fluoroketone'].ingredients = {{type = 'fluid', name = 'light-oil', amount =50}, {type = 'fluid', name = 'petroleum-gas', amount =50}, {type = 'item', name = 'steel-plate', amount =1}} + data.raw.recipe['fluoroketone'].ingredients = {{type = 'fluid', name = 'light-oil', amount = 50}, {type = 'fluid', name = 'petroleum-gas', amount = 50}, {type = 'item', name = 'steel-plate', amount = 1}} data.raw.recipe['fluoroketone-cooling'].category = 'chemistry' data.raw.recipe['fusion-power-cell'].category = 'crafting-with-fluid' - data.raw.recipe['fusion-power-cell'].ingredients = {{type = 'item', name = 'steel-plate', amount =5}, {type = 'fluid', name = 'petroleum-gas', amount =100}} + data.raw.recipe['fusion-power-cell'].ingredients = {{type = 'item', name = 'steel-plate', amount = 5}, {type = 'fluid', name = 'petroleum-gas', amount = 100}} data.raw['plant']['yumako-tree'].hidden = true data.raw['plant']['yumako-tree'].hidden_in_factoriopedia = true @@ -1431,7 +1430,7 @@ if settings.startup['PHI-SA'].value then for _, v in pairs(data.raw.tree) do if v.minable and v.minable.results then - v.minable.results = {{type = 'item', name = 'wood', amount =4}} + v.minable.results = {{type = 'item', name = 'wood', amount = 4}} end end end @@ -1517,7 +1516,7 @@ if settings.startup['PHI-CT'].value then localised_name = item.localised_name }}) - table.insert(data.raw.technology['electric-energy-accumulators'].effects, {type = 'unlock-recipe', recipe =item.name}) + table.insert(data.raw.technology['electric-energy-accumulators'].effects, {type = 'unlock-recipe', recipe = item.name}) for _, v in pairs(data.raw.fluid) do if v.subgroup == 'fluid' and (not data.raw[v.name]) then