diff --git a/changelog.txt b/changelog.txt index 3253973..83e73e4 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,17 @@ --------------------------------------------------------------------------------------------------- Version: 1.0.11 +Date: 13.4.2022 + Features: + - updated ru locale thanks to Astorin + + Changes: + - Overhaul mode is now off by default to prevent sync issues + - made early game techs towards ass. machine 2 cheaper to improve early game + + Bugfixes: + - temporary fix for multiplayer GUI handling by x2605 +--------------------------------------------------------------------------------------------------- +Version: 1.0.11 Date: 8.4.2022 Features: - added icon to not operable KI beacons diff --git a/data.lua b/data.lua index 082225b..cc39776 100644 --- a/data.lua +++ b/data.lua @@ -38,6 +38,7 @@ require('prototypes/fission/fi_modules') require('prototypes/fission/fi_fiberer') require('prototypes/fission/fi_compound_machine') require('prototypes/fission/fi_castor') +require('prototypes/fission/fi_refinery') require('prototypes/fusion/fu_fusor') require('prototypes/fusion/fu_boiler') @@ -77,6 +78,12 @@ require('prototypes/fi_recipes') require('prototypes/fu_recipes') require('prototypes/gr_recipes') +--fix early kerosene +table.insert(data.raw.technology["advanced-oil-processing"].effects, { + type = 'unlock-recipe', + recipe = 'el_kerosene_recipe', +}) + --booktorio if mods["Booktorio"] then require('bk_sprites') @@ -116,4 +123,6 @@ end require('scripts/gravitation/gr_make_white_hole_recipes') --make item vent recipes -require('scripts/electronic/el_burner') \ No newline at end of file +require('scripts/electronic/el_burner') + + diff --git a/prototypes/248k_subgroups.lua b/prototypes/248k_subgroups.lua index f40fed4..84a8f33 100644 --- a/prototypes/248k_subgroups.lua +++ b/prototypes/248k_subgroups.lua @@ -326,6 +326,11 @@ data:extend({ name = 'fi_crushing', type = 'recipe-category', }, + --fi refining + { + name = 'fi_refining', + type = 'recipe-category', + }, --fi_modules --producticity { diff --git a/prototypes/el_recipes.lua b/prototypes/el_recipes.lua index d8c1265..0503352 100644 --- a/prototypes/el_recipes.lua +++ b/prototypes/el_recipes.lua @@ -1204,7 +1204,23 @@ data:extend({ energy_required = 1, order = 'a-b', }, - + { + name = 'el_kerosene_basic_recipe', + type = 'recipe', + enabled = 'false', + category = 'oil-processing', + main_product = 'el_kerosene', + ingredients = { + {type="fluid", name="crude-oil", amount=200}, + {type="fluid", name="steam", amount=100}, + }, + results = { + {type="fluid", name="el_kerosene", amount=140}, + {type="fluid", name="water", amount=90}, + }, + result_count = 1, + energy_required = 5, + }, diff --git a/prototypes/fi_recipes.lua b/prototypes/fi_recipes.lua index 7114372..2bfdaf7 100644 --- a/prototypes/fi_recipes.lua +++ b/prototypes/fi_recipes.lua @@ -1204,4 +1204,32 @@ data:extend({ order = 'a-b', always_show_made_in = true, }, + { + name = 'fi_refinery_recipe', + type = 'recipe', + enabled = 'false', + category = 'crafting', + ingredients = { + {type="item", name="el_materials_ALK", amount=1}, + }, + results = { + {type="item", name="fi_refinery_item", amount=1} + }, + energy_required = 1, + order = 'a-b', + }, + { + name = 'fi_refinery_blank_recipe', + type = 'recipe', + enabled = 'false', + category = 'fi_refining', + ingredients = { + {type="fluid", name="water", amount=100}, + }, + results = { + {type="fluid", name="steam", amount=100} + }, + energy_required = 1, + order = 'a-b', + }, }) \ No newline at end of file diff --git a/prototypes/fission/fi_refinery.lua b/prototypes/fission/fi_refinery.lua new file mode 100644 index 0000000..5bb1efe --- /dev/null +++ b/prototypes/fission/fi_refinery.lua @@ -0,0 +1,201 @@ +--local functions +local function config(name) + return settings.startup['fi_refinery_'..name].value +end + +local function sprite(name) + return '__248k__/ressources/fission/fi_refinery/fi_refinery_'..name +end + +--item +data:extend({ + { + name = 'fi_refinery_item', + type = 'item', + icon = sprite('icon.png'), + icon_size = 64, + place_result = 'fi_refinery_entity', + stack_size = 20, + subgroup = 'fi_item_subgroup_c', + order = 'a-c', + }, + +}) + +--entity +data:extend({ + --prototype + { + name = 'fi_refinery_entity', + type = 'assembling-machine', + icon = sprite('icon.png'), + icon_size = 64, + flags = {"player-creation","placeable-neutral"}, + max_health = 300, + corpse = 'big-remnants', + collision_box = {{-3.4,-3.4},{3.4,3.4}}, + selection_box = {{-3.5,-3.5},{3.5,3.5}}, + map_color = {r=0, g=0, b=1, a=1}, + minable = { + mining_time = 1, + result = 'fi_refinery_item', + }, + crafting_categories = {'fi_refining'}, + crafting_speed = 1, + energy_source = { + type = 'electric', + usage_priority = 'secondary-input', + --input_flow_limit = '4MW', + }, + energy_usage = '1MW', + allowed_effects = {"speed", "productivity", "consumption", "pollution"}, + module_specification = { + module_info_icon_shift = { + 0, + 0.8 + }, + module_slots = 2 + }, + + fluid_boxes = { + { + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {type = "input", position = {1, 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 = {-1, 4}}, + }, + production_type = "input" + }, + + { + base_area = 1, + height = 2, + base_level = 1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {type = "output", position = {1, -4}}, + }, + production_type = "output" + }, + { + base_area = 1, + height = 2, + base_level = 1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {type = "output", position = {-1, -4}}, + }, + production_type = "output" + }, + + { + base_area = 1, + height = 2, + base_level = -1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {type = "input", position = {-4, -1}}, + }, + 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, 1}}, + }, + production_type = "input" + }, + + { + base_area = 1, + height = 2, + base_level = 1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {type = "output", position = {4, 1}}, + }, + production_type = "output" + }, + { + base_area = 1, + height = 2, + base_level = 1, + pipe_covers = pipecoverspictures(), + pipe_picture = grey_south_pipe_picture, + pipe_connections = + { + {type = "output", position = {4, -1}}, + }, + production_type = "output" + }, + + }, + + --animation + animation = { + filename = sprite('base.png'), + size = {1024, 1024}, + scale = 0.339, + shift = {1.31,-1.9}, + line_length = 1, + lines_per_file = 1, + frame_count = 1, + animation_speed = 1, + }, + working_visualisations = { + { + animation = + { + filename = sprite('animation.png'), + size = {1024, 1024}, + scale = 0.339, + line_length = 3, + lines_per_file = 3, + frame_count = 9, + animation_speed = 0.3, + shift = {1.31,-1.9} + }, + light = { + type = "basic", + intensity = 1, + size = 16, + color = {r=1 ,g=1 ,b=1 }, + } + } + }, + + working_sound = { + sound = { filename ='__base__/sound/electric-mining-drill.ogg'}, + apparent_volume = 2.7, + }, + }, +}) \ No newline at end of file diff --git a/ressources/fission/fi_refinery/fi_refinery_animation.png b/ressources/fission/fi_refinery/fi_refinery_animation.png new file mode 100644 index 0000000..474dfda Binary files /dev/null and b/ressources/fission/fi_refinery/fi_refinery_animation.png differ diff --git a/ressources/fission/fi_refinery/fi_refinery_base.png b/ressources/fission/fi_refinery/fi_refinery_base.png new file mode 100644 index 0000000..dd945b9 Binary files /dev/null and b/ressources/fission/fi_refinery/fi_refinery_base.png differ diff --git a/ressources/fission/fi_refinery/fi_refinery_icon.png b/ressources/fission/fi_refinery/fi_refinery_icon.png new file mode 100644 index 0000000..90bda62 Binary files /dev/null and b/ressources/fission/fi_refinery/fi_refinery_icon.png differ diff --git a/ressources/techs/fi_refinery_tech.png b/ressources/techs/fi_refinery_tech.png new file mode 100644 index 0000000..c25bf16 Binary files /dev/null and b/ressources/techs/fi_refinery_tech.png differ diff --git a/scripts/overhaul.lua b/scripts/overhaul.lua index ffd350e..44a717c 100644 --- a/scripts/overhaul.lua +++ b/scripts/overhaul.lua @@ -168,67 +168,6 @@ tech_table = { --=================================================================================================================== -- structures and adding --=================================================================================================================== -data:extend({ - { - name = 'el_kerosene_basic_recipe', - type = 'recipe', - enabled = 'false', - category = 'oil-processing', - main_product = 'el_kerosene', - ingredients = { - {type="fluid", name="crude-oil", amount=200}, - {type="fluid", name="steam", amount=100}, - }, - results = { - {type="fluid", name="el_kerosene", amount=140}, - {type="fluid", name="water", amount=90}, - }, - result_count = 1, - energy_required = 5, - }, - { - name = 'el_kerosene_tech', - type = 'technology', - icon = '__248k__/ressources/techs/el_kerosene_tech.png', - icon_size = 128, - prerequisites = {'el_ALK_tech'}, - effects = { - { - type = 'unlock-recipe', - recipe = 'el_kerosene_basic_recipe', - }, - { - type = 'unlock-recipe', - recipe = 'el_desulfurized_kerosene_recipe', - }, - { - type = 'unlock-recipe', - recipe = 'el_usage_acidic_water_recipe', - }, - { - type = 'unlock-recipe', - recipe = 'el_tank_recipe', - }, - { - type = 'nothing', - effect_description = {'description.el_kerosene_tech_eff'}, - }, - }, - unit = { - count = '150', - ingredients = { - {'automation-science-pack',1}, - {'logistic-science-pack',1,}, - }, - time = 30, - }, - }, -}) - -table.insert(data.raw.technology["advanced-oil-processing"].effects, { - type = 'unlock-recipe', - recipe = 'el_kerosene_recipe', -}) recipe_structure = {"recipe", "item", "item_amount"} tech_structure = {"tech", "pre_tech"}