added ingots, etc for 1.0.28

This commit is contained in:
PreLeyZero 2022-06-17 21:32:38 +02:00
parent e936aff9fb
commit a8c823008a
32 changed files with 725 additions and 6 deletions

View file

@ -473,6 +473,10 @@ data:extend({
name = 'fi_compound_machine_category',
type = 'recipe-category',
},
{
name = 'fu_ingot_category',
type = 'recipe-category',
},
{
name = 'fu_laser_category',
type = 'recipe-category',

View file

@ -1115,6 +1115,22 @@ data:extend({
type = 'unlock-recipe',
recipe = 'fi_rich_powder_recipe',
},
{
type = 'unlock-recipe',
recipe = 'fi_rich_solution_pack_recipe',
},
{
type = 'unlock-recipe',
recipe = 'fi_rich_solution_unpack_recipe',
},
{
type = 'unlock-recipe',
recipe = 'fi_dirty_solution_pack_recipe',
},
{
type = 'unlock-recipe',
recipe = 'fi_dirty_solution_unpack_recipe',
},
{
type = 'unlock-recipe',
recipe = 'fi_extract_rich_powder_recipe',
@ -1864,6 +1880,153 @@ data:extend({
time = 45,
},
},
{
name = 'fu_ingot_tech',
type = 'technology',
icon = sprite('fu_ingot_tech.png'),
icon_size = 128,
prerequisites = {
'fu_TIM_tech',
'fu_KFK_tech'
},
effects = {
{
type = 'unlock-recipe',
recipe = 'fu_ingot_recipe',
},
{
type = 'unlock-recipe',
recipe = 'fu_treat_slag_recipe',
},
},
unit = {
count = '200',
ingredients = {
{'chemical-science-pack',1},
{'automation-science-pack',1},
{'logistic-science-pack',1},
{'utility-science-pack',1}
},
time = 45,
},
},
{
name = 'fu_gold_ingot_tech',
type = 'technology',
icon = sprite('fu_gold_ingot_tech.png'),
icon_size = 128,
prerequisites = {
'fu_ingot_tech',
},
effects = {
{
type = 'unlock-recipe',
recipe = 'fu_gold_ingot_recipe',
},
{
type = 'unlock-recipe',
recipe = 'fu_gold_plate_recipe',
},
},
unit = {
count = '200',
ingredients = {
{'chemical-science-pack',1},
{'automation-science-pack',1},
{'logistic-science-pack',1},
{'utility-science-pack',1},
},
time = 45,
},
},
{
name = 'fu_neodym_ingot_tech',
type = 'technology',
icon = sprite('fu_neodym_ingot_tech.png'),
icon_size = 128,
prerequisites = {
'fu_ingot_tech',
},
effects = {
{
type = 'unlock-recipe',
recipe = 'fu_neodym_ingot_recipe',
},
{
type = 'unlock-recipe',
recipe = 'fu_neodym_plate_recipe',
},
},
unit = {
count = '200',
ingredients = {
{'chemical-science-pack',1},
{'automation-science-pack',1},
{'logistic-science-pack',1},
{'utility-science-pack',1},
},
time = 45,
},
},
{
name = 'fu_titan_ingot_tech',
type = 'technology',
icon = sprite('fu_titan_ingot_tech.png'),
icon_size = 128,
prerequisites = {
'fu_ingot_tech',
},
effects = {
{
type = 'unlock-recipe',
recipe = 'fu_titan_ingot_recipe',
},
{
type = 'unlock-recipe',
recipe = 'fu_titan_plate_recipe',
},
},
unit = {
count = '200',
ingredients = {
{'chemical-science-pack',1},
{'automation-science-pack',1},
{'logistic-science-pack',1},
{'utility-science-pack',1},
},
time = 45,
},
},
{
name = 'fu_lead_ingot_tech',
type = 'technology',
icon = sprite('fu_lead_ingot_tech.png'),
icon_size = 128,
prerequisites = {
'fu_ingot_tech',
'fu_lead_tech',
},
effects = {
{
type = 'unlock-recipe',
recipe = 'fu_lead_ingot_recipe',
},
{
type = 'unlock-recipe',
recipe = 'fu_lead_plate_recipe',
},
},
unit = {
count = '200',
ingredients = {
{'chemical-science-pack',1},
{'automation-science-pack',1},
{'logistic-science-pack',1},
{'utility-science-pack',1},
},
time = 45,
},
},
{
name = 'fu_laser_tech',
type = 'technology',

View file

@ -1535,4 +1535,94 @@ data:extend({
subgroup = 'fluid-recipes',
order = 'b[fluid-chemistry]-e[solid-fuel-from-heavy-oil]-d',
},
{
name = 'fi_rocket_fuel_1_recipe',
type = 'recipe',
enabled = 'false',
category = 'chemistry',
main_product = 'rocket-fuel',
icon = sprite('icons/fi_rocket_2.png'),
icon_size = 64,
ingredients = {
{type="fluid", name="el_kerosene", amount=20},
{type="item", name="solid-fuel", amount=10},
},
results = {
{type="item", name="rocket-fuel", amount=1},
},
result_count = 1,
energy_required = 30,
subgroup = 'fluid-recipes',
order = 'b[fluid-chemistry]-e[solid-fuel-from-heavy-oil]-d',
},
{
name = 'fi_rich_solution_pack_recipe',
type = 'recipe',
enabled = 'false',
category = 'crafting-with-fluid',
main_product = 'fi_materials_rich_solution',
ingredients = {
{type="item", name="fi_materials_empty_solution", amount=1},
{type="fluid", name="fi_dirty_water", amount=1000},
},
results = {
{type="item", name="fi_materials_rich_solution", amount=1},
},
result_count = 1,
energy_required = 0.2,
always_show_made_in = true,
},
{
name = 'fi_rich_solution_unpack_recipe',
type = 'recipe',
enabled = 'false',
category = 'crafting-with-fluid',
main_product = 'fi_dirty_water',
ingredients = {
{type="item", name="fi_materials_rich_solution", amount=1},
},
results = {
{type="fluid", name="fi_dirty_water", amount=1000},
{type="item", name="fi_materials_empty_solution", amount=1},
},
result_count = 1,
energy_required = 0.2,
always_show_made_in = true,
},
{
name = 'fi_dirty_solution_pack_recipe',
type = 'recipe',
enabled = 'false',
category = 'crafting-with-fluid',
main_product = 'fi_materials_dirty_solution',
ingredients = {
{type="item", name="fi_materials_empty_solution", amount=1},
{type="fluid", name="el_dirty_water", amount=1000},
},
results = {
{type="item", name="fi_materials_dirty_solution", amount=1},
},
result_count = 1,
energy_required = 0.2,
always_show_made_in = true,
},
{
name = 'fi_dirty_solution_unpack_recipe',
type = 'recipe',
enabled = 'false',
category = 'crafting-with-fluid',
main_product = 'el_dirty_water',
ingredients = {
{type="item", name="fi_materials_dirty_solution", amount=1},
},
results = {
{type="fluid", name="el_dirty_water", amount=1000},
{type="item", name="fi_materials_dirty_solution", amount=1},
},
result_count = 1,
energy_required = 0.2,
always_show_made_in = true,
subgroup = 'fi_item_subgroup_f',
order = 'f-a',
},
})

View file

@ -180,5 +180,23 @@ data:extend({
subgroup = 'fi_item_subgroup_a-b',
order = 'b-a',
},
{
name = 'fi_materials_rich_solution',
type = 'item',
icon = sprite('rich_solution.png'),
icon_size = 64,
stack_size = 100,
subgroup = 'fi_item_subgroup_b',
order = 'f-b',
},
{
name = 'fi_materials_dirty_solution',
type = 'item',
icon = sprite('dirty_solution.png'),
icon_size = 64,
stack_size = 100,
subgroup = 'fi_item_subgroup_b',
order = 'f-b',
},
})

View file

@ -52,7 +52,16 @@ local limitation_list = {
'fi_refinery_sulfur_recipe',
'fi_refinery_kerosene_coal_recipe',
'fi_refinery_kerosene_recipe',
'fi_empty_solution_recipe'
'fi_empty_solution_recipe',
'fu_gold_ingot_recipe',
'fu_titan_ingot_recipe',
'fu_neodym_ingot_recipe',
'fu_lead_ingot_recipe',
'fu_gold_plate_recipe',
'fu_titan_plate_recipe',
'fu_neodym_plate_recipe',
'fu_lead_plate_recipe',
}
--item

View file

@ -1911,4 +1911,200 @@ data:extend({
result_count = 1,
energy_required = 10,
},
{
name = 'fu_ingot_recipe',
type = 'recipe',
enabled = 'false',
category = 'crafting',
main_product = 'fu_ingot_item',
ingredients = {
{'concrete',50},
{'fu_materials_TIM',40},
{'fu_materials_KFK',40},
{'fi_materials_GFK',40},
{'iron-gear-wheel',20},
{'electric-furnace',2},
},
results = {
{type="item", name="fu_ingot_item", amount=1},
},
result_count = 1,
energy_required = 5,
},
{
name = 'fu_gold_ingot_recipe',
type = 'recipe',
enabled = 'false',
category = 'fu_ingot_category',
main_product = 'fu_materials_gold_ingot',
ingredients = {
{type="fluid", name="fi_arc_gold", amount=175},
},
results = {
{type="item", name="fu_materials_gold_ingot", amount=1},
{type="item", name="fu_materials_slag", amount=1, probability=0.25},
},
result_count = 1,
energy_required = 0.2*6,
subgroup = 'fu_item_subgroup_a',
order = 'a-a-a',
always_show_made_in = true,
},
{
name = 'fu_gold_plate_recipe',
type = 'recipe',
enabled = 'false',
category = 'crafting',
main_product = 'fi_materials_gold',
ingredients = {
{type="item", name="fu_materials_gold_ingot", amount=1},
},
results = {
{type="item", name="fi_materials_gold", amount=2},
},
result_count = 1,
energy_required = 0.2,
subgroup = 'fu_item_subgroup_a',
order = 'a-a-b',
always_show_made_in = true,
},
{
name = 'fu_neodym_ingot_recipe',
type = 'recipe',
enabled = 'false',
category = 'fu_ingot_category',
main_product = 'fu_materials_neodym_ingot',
ingredients = {
{type="fluid", name="fi_arc_neodym", amount=175},
},
results = {
{type="item", name="fu_materials_neodym_ingot", amount=1},
{type="item", name="fu_materials_slag", amount=1, probability=0.25},
},
result_count = 1,
energy_required = 0.2*6,
subgroup = 'fu_item_subgroup_a',
order = 'a-a-a',
always_show_made_in = true,
},
{
name = 'fu_neodym_plate_recipe',
type = 'recipe',
enabled = 'false',
category = 'crafting',
main_product = 'fi_materials_neodym',
ingredients = {
{type="item", name="fu_materials_neodym_ingot", amount=1},
},
results = {
{type="item", name="fi_materials_neodym", amount=2},
},
result_count = 1,
energy_required = 0.2,
subgroup = 'fu_item_subgroup_a',
order = 'a-a-b',
always_show_made_in = true,
},
{
name = 'fu_titan_ingot_recipe',
type = 'recipe',
enabled = 'false',
category = 'fu_ingot_category',
main_product = 'fu_materials_titan_ingot',
ingredients = {
{type="fluid", name="fi_arc_titan", amount=175},
},
results = {
{type="item", name="fu_materials_titan_ingot", amount=1},
{type="item", name="fu_materials_slag", amount=1, probability=0.25},
},
result_count = 1,
energy_required = 0.2*6,
subgroup = 'fu_item_subgroup_a',
order = 'a-a-a',
always_show_made_in = true,
},
{
name = 'fu_titan_plate_recipe',
type = 'recipe',
enabled = 'false',
category = 'crafting',
main_product = 'fi_materials_titan',
ingredients = {
{type="item", name="fu_materials_titan_ingot", amount=1},
},
results = {
{type="item", name="fi_materials_titan", amount=2},
},
result_count = 1,
energy_required = 0.2,
subgroup = 'fu_item_subgroup_a',
order = 'a-a-b',
always_show_made_in = true,
},
{
name = 'fu_lead_ingot_recipe',
type = 'recipe',
enabled = 'false',
category = 'fu_ingot_category',
main_product = 'fu_materials_lead_ingot',
ingredients = {
{type="fluid", name="fu_arc_pure_lead", amount=175},
},
results = {
{type="item", name="fu_materials_lead_ingot", amount=1},
{type="item", name="fu_materials_slag", amount=1, probability=0.25},
},
result_count = 1,
energy_required = 0.2*6,
subgroup = 'fu_item_subgroup_a',
order = 'a-a-a',
always_show_made_in = true,
},
{
name = 'fu_lead_plate_recipe',
type = 'recipe',
enabled = 'false',
category = 'crafting',
main_product = 'fu_lead_item',
ingredients = {
{type="item", name="fu_materials_lead_ingot", amount=1},
},
results = {
{type="item", name="fu_lead_item", amount=2},
},
result_count = 1,
energy_required = 0.2,
subgroup = 'fu_item_subgroup_a',
order = 'a-a-b',
always_show_made_in = true,
},
{
name = 'fu_treat_slag_recipe',
type = 'recipe',
enabled = 'false',
category = 'crafting-with-fluid',
main_product = 'el_dirty_water',
ingredients = {
{type="item", name="fu_materials_slag", amount=10},
{type="fluid", name="water", amount=25},
},
results = {
{type="fluid", name="el_dirty_water", amount=25},
},
result_count = 1,
energy_required = 0.2,
always_show_made_in = true,
subgroup = 'fu_item_subgroup_f',
order = 'f',
icon_size = 64,
icons = {
{
icon = "__248k__/ressources/fluids/el_dirty_water.png"
},
{
icon = "__248k__/ressources/icons/overlay_slag.png"
}
},
},
})

View file

@ -0,0 +1,174 @@
--local functions
local function config(name)
return settings.startup['fu_ingot_'..name].value
end
local function sprite(name)
return '__248k__/ressources/fusion/fu_ingot/fu_ingot_'..name
end
--item
data:extend({
{
name = 'fu_ingot_item',
type = 'item',
icon = sprite('icon.png'),
icon_size = 64,
place_result = 'fu_ingot_entity',
stack_size = 20,
subgroup = 'fu_item_subgroup_c',
order = 'a-b',
},
})
--entity
data:extend({
--prototype
{
name = 'fu_ingot_entity',
type = 'assembling-machine',
icon = sprite('icon.png'),
icon_size = 64,
flags = {"player-creation","placeable-neutral"},
max_health = 300,
corpse = 'big-remnants',
collision_box = {{-3.4,-3.4},{3.4,3.4}},
selection_box = {{-3.5,-3.5},{3.5,3.5}},
map_color = {r=0, g=0, b=1, a=1},
minable = {
mining_time = 1,
result = 'fu_ingot_item',
},
crafting_categories = {'fu_ingot_category', 'smelting'},
crafting_speed = 6,
ingredient_count = 2,
--fixed_recipe = 'el_water_pressure_recipe',
energy_source = {
type = 'electric',
usage_priority = 'secondary-input',
},
energy_usage = '2MW',
allowed_effects = {"speed", "consumption", "pollution", "productivity"},
module_specification = {
module_info_icon_shift = {
0,
0.8
},
module_slots = 2
},
fluid_boxes = {
{
base_area = 1,
height = 2,
base_level = -1,
pipe_covers = pipecoverspictures(),
pipe_picture = grey_south_pipe_picture,
pipe_connections =
{
{type = "input", position = {0, -4}},
},
production_type = "input"
},
{
base_area = 1,
height = 2,
base_level = -1,
pipe_covers = pipecoverspictures(),
pipe_picture = grey_south_pipe_picture,
pipe_connections =
{
{type = "input", position = {-4, 0}}
},
production_type = "input"
},
{
base_area = 1,
height = 2,
base_level = -1,
pipe_covers = pipecoverspictures(),
pipe_picture = grey_south_pipe_picture,
pipe_connections =
{
{type = "input", position = {4, 0}},
--{type = "output", position = {2, -2.5}}
},
production_type = "input"
},
{
base_area = 1,
height = 2,
base_level = -1,
pipe_covers = pipecoverspictures(),
pipe_picture = grey_south_pipe_picture,
pipe_connections =
{
{type = "input", position = {0, 4}},
},
production_type = "input"
},
},
--animation
animation = {
filename = sprite('entity_base.png'),
size = {512,512},
scale = 0.54,
line_length = 1,
--lines_per_file = 2,
frame_count = 1,
--animation_speed = 0.2,
shift = {0,-0.3}
},
working_visualisations = {
{
animation =
{
filename = sprite('entity_animation.png'),
size = {512,512},
scale = 0.54,
line_length = 2,
lines_per_file = 2,
frame_count = 4,
animation_speed = 0.2,
shift = {0,-0.3}
},
light = {
type = "basic",
intensity = 1,
size = 15,
color = {r=0.79 ,g=0.08 ,b=0.87 },
}
}
},
working_sound =
{
sound = {filename = "__base__/sound/electric-furnace.ogg" },
apparent_volume = 0.3,
},
},
})
--{
-- production_type = "input",
--pipe_picture = assembler2pipepictures(),
--pipe_covers = pipecoverspictures(),
-- base_area = 10,
-- base_level = -1,
-- pipe_connections = {
-- { type="input", position = {-2, -2,5} },
-- { type="input", position = {2, -2.5} },
-- },
-- },
-- {
-- production_type = "output",
--pipe_picture = assembler2pipepictures(),
--pipe_covers = pipecoverspictures(),
-- base_area = 10,
-- base_level = 1,
-- pipe_connections = {{ type="output", position = {2, 2.5} }},
-- },
-- off_when_no_fluid_recipe = true

View file

@ -157,4 +157,49 @@ data:extend({
subgroup = 'fi_item_subgroup_a',
order = 'f-a',
},
{
name = 'fu_materials_gold_ingot',
type = 'item',
icon = sprite('gold_ingot.png'),
icon_size = 64,
stack_size = 100,
subgroup = 'fu_item_subgroup_a',
order = 'a-a',
},
{
name = 'fu_materials_titan_ingot',
type = 'item',
icon = sprite('titan_ingot.png'),
icon_size = 64,
stack_size = 100,
subgroup = 'fu_item_subgroup_a',
order = 'a-a',
},
{
name = 'fu_materials_neodym_ingot',
type = 'item',
icon = sprite('neodym_ingot.png'),
icon_size = 64,
stack_size = 100,
subgroup = 'fu_item_subgroup_a',
order = 'a-a',
},
{
name = 'fu_materials_lead_ingot',
type = 'item',
icon = sprite('lead_ingot.png'),
icon_size = 64,
stack_size = 100,
subgroup = 'fu_item_subgroup_a',
order = 'a-a',
},
{
name = 'fu_materials_slag',
type = 'item',
icon = sprite('slag.png'),
icon_size = 64,
stack_size = 100,
subgroup = 'fu_item_subgroup_a',
order = 'f-a',
},
})