cacklingfiend/248k_2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update 1.0.4

Browse source
This commit is contained in:
PreLeyZero 2022-03-30 02:02:34 +02:00
parent d38be3b1d2
commit cad6cc6a83
17 changed files with 265 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

4
prototypes/248k_subgroups.lua
View file

@ -344,6 +344,10 @@ data:extend({
name = 'fu_boiler_crafting_category',
type = 'recipe-category',
},
{
name = 'fu_burner_category',
type = 'recipe-category',
},
--fu_reactors
{
name = 'fu_stelar_reactor_crafting_category',

44
prototypes/248k_techs.lua
View file

@ -195,6 +195,10 @@ data:extend({
{
type = 'unlock-recipe',
recipe = 'el_purify_uranium_acidic_recipe',
},
{
type = 'unlock-recipe',
recipe = 'el_dirty_water_vent_2_recipe',
}
},
unit = {
@ -1048,6 +1052,40 @@ data:extend({
time = 30,
},
},
{
name = 'fi_advanced_purifier_tech',
type = 'technology',
icon = sprite('fi_purifier_2_tech.png'),
icon_size = 128,
prerequisites = {'fi_purifier_tech', 'uranium-processing'},
effects = {
{
type = 'unlock-recipe',
recipe = 'fi_empty_solution_recipe',
},
{
type = 'unlock-recipe',
recipe = 'fi_solution_recipe',
},
{
type = 'unlock-recipe',
recipe = 'fi_rich_powder_recipe',
},
{
type = 'unlock-recipe',
recipe = 'fi_extract_rich_powder_recipe',
},
},
unit = {
count = '600',
ingredients = {
{'chemical-science-pack',1},
{'automation-science-pack',1},
{'logistic-science-pack',1,},
},
time = 30,
},
},
{
name = 'fi_purifier_2_tech',
type = 'technology',
@ -1122,7 +1160,7 @@ data:extend({
type = 'technology',
icon = sprite('fi_refining_tech.png'),
icon_size = 128,
prerequisites = {'fi_purifier_2_tech'},
prerequisites = {'fi_purifier_2_tech', 'fi_advanced_purifier_tech'},
effects = {
{
type = 'unlock-recipe',
@ -1839,6 +1877,10 @@ data:extend({
type = 'unlock-recipe',
recipe = 'fu_boiler_recipe',
},
{
type = 'unlock-recipe',
recipe = 'fu_burn_oxygen_recipe',
},
{
type = 'unlock-recipe',
recipe = 'fu_burner_recipe',

15
prototypes/el_recipes.lua
View file

@ -1179,6 +1179,21 @@ data:extend({
energy_required = 0.2,
order = 'a-b',
},
{
name = 'el_dirty_water_vent_2_recipe',
type = 'recipe',
enabled = 'false',
subgroup = 'el_item_subgroup_a',
category = 'el_purifier_category',
ingredients = {
{type="fluid", name="el_dirty_water", amount=100},
},
results = {
{type="fluid", name="water", amount=100},
},
energy_required = 0.2,
order = 'a-b',
},
{
name = 'el_dirty_water_landfill_recipe',
type = 'recipe',

99
prototypes/fi_recipes.lua
View file

@ -192,10 +192,12 @@ data:extend({
main_product = 'fi_plutonium239_item',
ingredients = {
{'fi_used_basic_fuel_item',6},
{type="item", name="fi_materials_solution", amount=1},
},
results = {
{'fi_plutonium239_item',1},
{'fi_materials_waste',1}
{'fi_materials_waste',1},
{type="item", name="fi_materials_empty_solution", amount=1, probability=0.95},
},
result_count = 1,
energy_required = 20,
@ -226,10 +228,12 @@ data:extend({
main_product = 'fi_uranium233_item',
ingredients = {
{'fi_used_basic_thorium_fuel_item',6},
{type="item", name="fi_materials_solution", amount=1},
},
results = {
{'fi_uranium233_item',1},
{'fi_materials_waste',1}
{'fi_materials_waste',1},
{type="item", name="fi_materials_empty_solution", amount=1, probability=0.95},
},
result_count = 1,
energy_required = 20,
@ -256,10 +260,12 @@ data:extend({
category = 'centrifuging',
ingredients = {
{'fi_used_advanced_fuel_item',4},
{type="item", name="fi_materials_solution", amount=1},
},
results = {
{'uranium-238',1},
{'fi_materials_waste',1}
{'fi_materials_waste',1},
{type="item", name="fi_materials_empty_solution", amount=1, probability=0.95},
},
result_count = 3,
energy_required = 20,
@ -275,10 +281,12 @@ data:extend({
main_product = 'uranium-238',
ingredients = {
{'fi_used_advanced_thorium_fuel_item',4},
{type="item", name="fi_materials_solution", amount=1},
},
results = {
{'uranium-238',1},
{'fi_materials_waste',1}
{'fi_materials_waste',1},
{type="item", name="fi_materials_empty_solution", amount=1, probability=0.95},
},
result_count = 3,
energy_required = 20,
@ -294,10 +302,12 @@ data:extend({
main_product = 'uranium-238',
ingredients = {
{'fi_used_pure_fuel_item',4},
{type="item", name="fi_materials_solution", amount=1},
},
results = {
{'uranium-238',1},
{'fi_materials_waste',1}
{'fi_materials_waste',1},
{type="item", name="fi_materials_empty_solution", amount=1, probability=0.95},
},
result_count = 3,
energy_required = 20,
@ -1114,5 +1124,84 @@ data:extend({
results = {},
energy_required = 150,
order = 'a-b',
always_show_made_in = true,
},
{
name = 'fi_empty_solution_recipe',
type = 'recipe',
enabled = 'false',
category = 'crafting',
main_product = 'fi_materials_empty_solution',
ingredients = {
{type="item", name="fi_materials_GFK", amount=6},
{type="item", name="empty-barrel", amount=1},
},
results = {
{type="item", name="fi_materials_empty_solution", amount=1},
},
energy_required = 1,
order = 'a-b',
--always_show_made_in = true,
},
{
name = 'fi_solution_recipe',
type = 'recipe',
enabled = 'false',
category = 'chemistry',
main_product = 'fi_materials_solution',
ingredients = {
{type="fluid", name="fi_strong_acid", amount=240},
{type="fluid", name="sulfuric-acid", amount=120},
{type="item", name="fi_materials_empty_solution", amount=1},
{type="item", name="el_lithium_item", amount=3},
},
results = {
{type="fluid", name="el_acidic_water", amount=20},
{type="item", name="fi_materials_solution", amount=1, probability=0.95},
{type="item", name="fi_materials_empty_solution", amount=1, probability=0.05},
},
energy_required = 6,
order = 'a-b',
always_show_made_in = true,
},
--purifier 10 stone + 100 strong acid = 50 rich water
--enrichment 10/2 stone + 120 strong acid = 150 rich water
{
name = 'fi_rich_powder_recipe',
type = 'recipe',
enabled = 'false',
category = 'centrifuging',
main_product = 'fi_materials_rich_powder',
ingredients = {
{type="item", name="fi_materials_solution", amount=1},
{type="item", name="fi_crushed_stone_item", amount=10},
{type="item", name="fi_crushed_coal_item", amount=20},
},
results = {
{type="item", name="fi_crushed_coal_item", amount=17},
{type="item", name="fi_materials_rich_powder", amount=3},
{type="item", name="fi_materials_empty_solution", amount=1},
},
energy_required = 6,
order = 'a-b',
always_show_made_in = true,
},
{
name = 'fi_extract_rich_powder_recipe',
type = 'recipe',
enabled = 'false',
category = 'chemistry',
main_product = 'fi_dirty_water',
ingredients = {
{type="item", name="fi_materials_rich_powder", amount=1},
{type="fluid", name="water", amount=300},
},
results = {
{type="fluid", name="fi_dirty_water", amount=250},
{type="fluid", name="el_dirty_water", amount=50},
},
energy_required = 1,
order = 'a-b',
always_show_made_in = true,
},
})

36
prototypes/fission/fi_materials.lua
View file

@ -144,5 +144,41 @@ data:extend({
subgroup = 'fi_item_subgroup_a',
order = 'f-a',
},
{
name = 'fi_materials_solution',
type = 'item',
icon = sprite('waste.png'),
icon_size = 64,
stack_size = 1,
subgroup = 'fi_item_subgroup_a-c',
order = 'f-a',
},
{
name = 'fi_materials_empty_solution',
type = 'item',
icon = sprite('empty_solution.png'),
icon_size = 64,
stack_size = 20,
subgroup = 'fi_item_subgroup_b',
order = 'f-a',
},
{
name = 'fi_materials_solution',
type = 'item',
icon = sprite('solution.png'),
icon_size = 64,
stack_size = 20,
subgroup = 'fi_item_subgroup_b',
order = 'f-b',
},
{
name = 'fi_materials_rich_powder',
type = 'item',
icon = sprite('rich_powder.png'),
icon_size = 64,
stack_size = 100,
subgroup = 'fi_item_subgroup_a-b',
order = 'b-a',
},
})

4
prototypes/fission/fi_modules.lua
View file

@ -43,7 +43,9 @@ local limitation_list = {
'gr_gold_wire_recipe',
'gr_circuit_recipe',
'gr_materials_stack_up_item_recipe',
'gr_materials_stack_down_item_recipe'
'gr_materials_stack_down_item_recipe',
'fi_rich_powder_recipe',
'fi_strong_acid_recipe'
}
--item

18
prototypes/fu_recipes.lua
View file

@ -1534,7 +1534,23 @@ data:extend({
result_count = 1,
energy_required = 4,
},
--Burner recipe
{
name = 'fu_burn_oxygen_recipe',
type = 'recipe',
category = 'fu_burner_category',
icon = '__248k__/ressources/elements/fu_oxygen.png',
icon_size = 64,
enabled = 'false',
ingredients = {
{type="fluid", name="fu_oxygen", amount=60},
},
results = {},
result_count = 1,
energy_required = 1,
always_show_made_in = true,
subgroup = 'fu_item_subgroup_f',
},
})

71
prototypes/fusion/fu_burner.lua
View file

@ -25,10 +25,10 @@ data:extend({
data:extend({
{
name = 'fu_burner_entity',
type = 'generator',
type = 'furnace',
icon = sprite('entity_icon.png'),
icon_size = 64,
flags = {"player-creation","placeable-neutral", "not-rotatable"},
flags = {"player-creation","placeable-neutral"},
--minable
minable = {
mining_time = 1,
@ -36,54 +36,55 @@ data:extend({
},
max_health = 150,
corpse = 'small-remnants',
crafting_categories = {'fu_burner_category'},
collision_box = {{-1.4,-1.4},{1.4,1.4}},
selection_box = {{-1.5,-1.5},{1.5,1.5}},
result_inventory_size = 2,
source_inventory_size = 1,
--energy
effectivity = 1,
energy_source = {
type = 'electric',
usage_priority = 'primary-output',
input_flow_limit = '0W',
output_flow_limit = tostring(config('power_output'))..'W',
usage_priority = 'secondary-input',
buffer_capacity = '5MJ',
},
max_power_output = tostring(config('power_output'))..'W',
maximum_temperature = 40,
fluid_usage_per_tick = 1,
fluid_box = {
base_area = 1,
height = 2,
base_level = -1,
filter = 'fu_oxygen',
minimum_temperature = 0,
maximum_temperature = 40,
production_type = 'input-output',
pipe_connections = {
{type = "input-output", position = {2, 0}},
{type = "input-output", position = {-2, 0}},
crafting_speed = 1,
energy_usage = '500KW',
fluid_boxes = {
{
base_area = 1,
height = 2,
base_level = -1,
production_type = 'input',
--pipe_picture = assembler2pipepictures(),
pipe_covers = pipecoverspictures(),
pipe_connections = {
{type = "input", position = {2, 0}},
--{type = "output", position = {-2, 0}},
},
},
},
fluid_input = {
name = 'fu_oxygen',
minimum_temperature = 0,
{
base_area = 1,
height = 2,
base_level = 1,
production_type = 'output',
--pipe_picture = assembler2pipepictures(),
pipe_covers = pipecoverspictures(),
pipe_connections = {
{type = "output", position = {-2, 0}},
--{type = "output", position = {-2, 0}},
},
}
},
--animation
vertical_animation = {
animation = {
filename = sprite('entity_animation.png'),
size = {420,448},
scale = 0.26,
scale = 0.265,
line_length = 1,
frame_count = 1,
animation_speed = 0.5,
shift = {0,-0.2}
},
horizontal_animation = {
filename = sprite('entity_animation.png'),
size = {420,448},
scale = 0.26,
line_length = 1,
frame_count = 1,
animation_speed = 0.5,
shift = {0,-0.2}
shift = {0,-0.4}
},
map_color = {r=0, g=0, b=1, a=1},
working_sound =

1
prototypes/gravitation/gr_black_hole.lua
View file

@ -54,6 +54,7 @@ data:extend({
buffer_capacity = "1TJ",
usage_priority = "primary-output",
max_input_flow = "0W",
max_output_flow = "1TW",
--drain = "1GW"
},
light = {