diff --git a/changelog.txt b/changelog.txt index 83e73e4..5fc39af 100644 --- a/changelog.txt +++ b/changelog.txt @@ -7,6 +7,8 @@ Date: 13.4.2022 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 + - added prerequisite for fi advanced purification tech + - unused crusher recipes are now hidden Bugfixes: - temporary fix for multiplayer GUI handling by x2605 diff --git a/data.lua b/data.lua index cc39776..fbae7f5 100644 --- a/data.lua +++ b/data.lua @@ -84,6 +84,13 @@ table.insert(data.raw.technology["advanced-oil-processing"].effects, { recipe = 'el_kerosene_recipe', }) +--add kerosene and desulfurized kerosene to flame thrower +if data.raw["fluid-turret"]["flamethrower-turret"] then + table.insert(data.raw["fluid-turret"]["flamethrower-turret"].attack_parameters.fluids, {type = "el_kerosene", damage_modifier = 1}) + table.insert(data.raw["fluid-turret"]["flamethrower-turret"].attack_parameters.fluids, {type = "el_desulfurized_kerosene", damage_modifier = 1}) +end + + --booktorio if mods["Booktorio"] then require('bk_sprites') diff --git a/locale/en/lang_en.cfg b/locale/en/lang_en.cfg index 808a333..31e5473 100644 --- a/locale/en/lang_en.cfg +++ b/locale/en/lang_en.cfg @@ -194,6 +194,7 @@ fi_arc_glass=Molten industrial glass fi_arc_gold=Molten gold fi_arc_titan=Molten titan fi_arc_neodym=Molten neodymium +fi_acid_water=Acid gas fu_hydrogen=Hydrogen @@ -318,7 +319,7 @@ fi_robo_charger_entity=Charging station fi_fiberer_entity=Fiber maker fi_compound_machine_entity=Compound material facility fi_castor_entity=Nuclear waste storage - +fi_refinery_entity=Oil processing facility fu_boiler_entity=Thermochemical separator fu_burner_entity=Item/fluid handling facility @@ -396,6 +397,10 @@ fi_modules_4_tech=Giga 248k modules fi_modules_5_tech=Tera 248k modules fi_modules_6_tech=Peta 248k modules fi_advanced_purifier_tech=Highly advanced purifaction +fi_refinery_tech=Oil processing facility +fi_refinery_2_tech=Sulfur based oil processing +fi_refinery_3_tech=Carbon based oil processing +fi_refinery_4_tech=Carbon based kerosene processing @@ -569,6 +574,11 @@ limitation_message=This module can not be used here. [recipe-name] fi_decay_waste_recipe=Decay nuclear waste fu_burn_oxygen_recipe=Vent oxygen +fi_refinery_basic_recipe=Highly advanced oil processing +fi_refinery_coal_recipe=Carbon driven oil processing +fi_refinery_sulfur_recipe=Sulfur driven oil processing +fi_refinery_kerosene_recipe=Kerosene seperation +fi_refinery_kerosene_coal_recipe=Carbon enriched kerosene seperation #booktorio [gui] diff --git a/prototypes/248k_fluids.lua b/prototypes/248k_fluids.lua index bb8bcee..1a44d5b 100644 --- a/prototypes/248k_fluids.lua +++ b/prototypes/248k_fluids.lua @@ -160,6 +160,21 @@ data:extend({ subgroup = 'fi_item_subgroup_f', order = 'a-a', }, + { + name = 'fi_acid_gas', + type = 'fluid', + icon = sprite('fi_acid_gas.png'), + icon_size = 64, + default_temperature = 15, + max_temperature = 1000, + heat_capacity = '1kJ', + base_color = { r=0.9, g=0.77, b=0.6 }, + flow_color = { r=0.9, g=0.77, b=0.6 }, + pressure_to_speed_ratio = 0.400, + flow_to_energy_ratio = 0, + subgroup = 'fi_item_subgroup_f', + order = 'a-a', + }, { name = 'fu_lead_fluid_hot', type = 'fluid', diff --git a/prototypes/248k_techs.lua b/prototypes/248k_techs.lua index 46bd029..6bd9a57 100644 --- a/prototypes/248k_techs.lua +++ b/prototypes/248k_techs.lua @@ -1061,7 +1061,7 @@ data:extend({ type = 'technology', icon = sprite('fi_purifier_2_tech.png'), icon_size = 128, - prerequisites = {'fi_purifier_tech', 'uranium-processing'}, + prerequisites = {'fi_purifier_tech', 'uranium-processing', 'fi_materials_tech'}, effects = { { type = 'unlock-recipe', @@ -1374,6 +1374,7 @@ data:extend({ type = 'unlock-recipe', recipe = 'fi_crushed_crystal_recipe', }, + --[[ { type = 'unlock-recipe', recipe = 'fi_crushed_iron_recipe', @@ -1382,14 +1383,17 @@ data:extend({ type = 'unlock-recipe', recipe = 'fi_crushed_copper_recipe', }, + ]] { type = 'unlock-recipe', recipe = 'fi_crushed_lithium_recipe', }, + --[[ { type = 'unlock-recipe', recipe = 'fi_crushed_aluminum_recipe', }, + ]] { type = 'unlock-recipe', recipe = 'fi_crushed_coal_recipe', @@ -1398,10 +1402,12 @@ data:extend({ type = 'unlock-recipe', recipe = 'fi_crushed_stone_recipe', }, + --[[ { type = 'unlock-recipe', recipe = 'fi_crushed_uranium_recipe', }, + ]] }, unit = { count = '200', @@ -1630,7 +1636,7 @@ data:extend({ type = 'technology', icon = sprite('fi_refinery_tech.png'), icon_size = 128, - prerequisites = {'fi_stage_tech'}, + prerequisites = {'fi_crusher_tech'}, effects = { { type = 'unlock-recipe', @@ -1638,8 +1644,16 @@ data:extend({ }, { type = 'unlock-recipe', - recipe = 'fi_refinery_blank_recipe', - } + recipe = 'fi_refinery_basic_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fi_crack_sulfur_gas_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fi_refinery_kerosene_recipe', + }, }, unit = { count = '100', @@ -1651,6 +1665,76 @@ data:extend({ time = 30, }, }, + { + name = 'fi_refinery_2_tech', + type = 'technology', + icon = sprite('fi_refinery_2_tech.png'), + icon_size = 128, + prerequisites = {'fi_refinery_tech'}, + effects = { + { + type = 'unlock-recipe', + recipe = 'fi_refinery_sulfur_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fi_crack_acid_gas_recipe', + } + }, + unit = { + count = '300', + ingredients = { + {'chemical-science-pack',1}, + {'automation-science-pack',1}, + {'logistic-science-pack',1,}, + }, + time = 30, + }, + }, + { + name = 'fi_refinery_3_tech', + type = 'technology', + icon = sprite('fi_refinery_3_tech.png'), + icon_size = 128, + prerequisites = {'fi_refinery_tech'}, + effects = { + { + type = 'unlock-recipe', + recipe = 'fi_refinery_coal_recipe', + } + }, + unit = { + count = '300', + ingredients = { + {'chemical-science-pack',1}, + {'automation-science-pack',1}, + {'logistic-science-pack',1,}, + }, + time = 30, + }, + }, + { + name = 'fi_refinery_4_tech', + type = 'technology', + icon = sprite('fi_refinery_4_tech.png'), + icon_size = 128, + prerequisites = {'fi_refinery_tech'}, + effects = { + { + type = 'unlock-recipe', + recipe = 'fi_refinery_kerosene_coal_recipe', + }, + }, + unit = { + count = '300', + ingredients = { + {'chemical-science-pack',1}, + {'automation-science-pack',1}, + {'logistic-science-pack',1,}, + }, + time = 30, + }, + }, --============================================================================================================================================================ --fu { diff --git a/prototypes/fi_recipes.lua b/prototypes/fi_recipes.lua index 2bfdaf7..31fd071 100644 --- a/prototypes/fi_recipes.lua +++ b/prototypes/fi_recipes.lua @@ -181,6 +181,7 @@ data:extend({ result_count = 4, energy_required = 20, order = 'b-b', + always_show_made_in = true, }, --uran etc @@ -1210,7 +1211,10 @@ data:extend({ enabled = 'false', category = 'crafting', ingredients = { - {type="item", name="el_materials_ALK", amount=1}, + {type="item", name="oil-refinery", amount=1}, + {'concrete',60}, + {'el_materials_ALK',20}, + {'engine-unit',15}, }, results = { {type="item", name="fi_refinery_item", amount=1} @@ -1219,17 +1223,150 @@ data:extend({ order = 'a-b', }, { - name = 'fi_refinery_blank_recipe', + name = 'fi_refinery_basic_recipe', type = 'recipe', enabled = 'false', category = 'fi_refining', + icon = sprite('icons/fi_refining_basic.png'), + icon_size = 64, ingredients = { - {type="fluid", name="water", amount=100}, + {type="fluid", name="crude-oil", amount=180}, + {type="fluid", name="steam", amount=100}, }, results = { - {type="fluid", name="steam", amount=100} + {type="fluid", name="petroleum-gas", amount=80}, + {type="fluid", name="fi_acid_gas", amount=20}, + {type="fluid", name="el_kerosene", amount=80}, + {type="fluid", name="heavy-oil", amount=20}, }, - energy_required = 1, - order = 'a-b', + energy_required = 6, + subgroup = 'fi_item_subgroup_f', + order = 'a-a', + always_show_made_in = true, + }, + { + name = 'fi_refinery_coal_recipe', + type = 'recipe', + enabled = 'false', + category = 'fi_refining', + icon = sprite('icons/fi_refining_coal.png'), + icon_size = 64, + ingredients = { + {type="fluid", name="crude-oil", amount=180}, + {type="fluid", name="steam", amount=100}, + {type="item", name="fi_crushed_coal_item", amount=10}, + }, + results = { + {type="fluid", name="petroleum-gas", amount=60}, + {type="fluid", name="fi_acid_gas", amount=30}, + {type="fluid", name="el_kerosene", amount=65}, + {type="fluid", name="heavy-oil", amount=75}, + }, + energy_required = 6, + subgroup = 'fi_item_subgroup_f', + order = 'a-a', + always_show_made_in = true, + }, + { + name = 'fi_refinery_sulfur_recipe', + type = 'recipe', + enabled = 'false', + category = 'fi_refining', + icon = sprite('icons/fi_refining_sulfur.png'), + icon_size = 64, + ingredients = { + {type="fluid", name="crude-oil", amount=180}, + {type="fluid", name="steam", amount=100}, + {type="item", name="sulfur", amount=3}, + }, + results = { + {type="fluid", name="petroleum-gas", amount=80}, + {type="fluid", name="fi_acid_gas", amount=50}, + {type="fluid", name="el_kerosene", amount=80}, + {type="fluid", name="heavy-oil", amount=20}, + }, + energy_required = 6, + subgroup = 'fi_item_subgroup_f', + order = 'a-a', + always_show_made_in = true, + }, + { + name = 'fi_crack_sulfur_gas_recipe', + type = 'recipe', + enabled = 'false', + category = 'chemistry', + main_product = 'sulfur', + ingredients = { + {type="fluid", name="fi_acid_gas", amount=10}, + {type="fluid", name="steam", amount=20}, + }, + results = { + {type="fluid", name="water", amount=15}, + {type="item", name="sulfur", amount=1}, + }, + energy_required = 0.5, + subgroup = 'fi_item_subgroup_f', + order = 'a-a', + always_show_made_in = true, + }, + { + name = 'fi_crack_acid_gas_recipe', + type = 'recipe', + enabled = 'false', + category = 'chemistry', + main_product = 'el_acidic_water', + ingredients = { + {type="fluid", name="fi_acid_gas", amount=20}, + {type="fluid", name="steam", amount=20}, + }, + results = { + {type="fluid", name="el_acidic_water", amount=20}, + {type="fluid", name="sulfuric-acid", amount=5}, + }, + energy_required = 0.5, + subgroup = 'fi_item_subgroup_f', + order = 'a-a', + always_show_made_in = true, + }, + { + name = 'fi_refinery_kerosene_recipe', + type = 'recipe', + enabled = 'false', + category = 'fi_refining', + icon = sprite('icons/fi_cracking_kerosene.png'), + icon_size = 64, + ingredients = { + {type="fluid", name="el_kerosene", amount=200}, + }, + results = { + {type="fluid", name="el_acidic_water", amount=80}, + {type="fluid", name="fi_acid_gas", amount=40}, + {type="fluid", name="el_desulfurized_kerosene", amount=80}, + }, + energy_required = 6, + subgroup = 'fi_item_subgroup_f', + order = 'a-a', + always_show_made_in = true, + }, + { + name = 'fi_refinery_kerosene_coal_recipe', + type = 'recipe', + enabled = 'false', + category = 'fi_refining', + icon = sprite('icons/fi_cracking_kerosene_coal.png'), + icon_size = 64, + ingredients = { + {type="fluid", name="el_kerosene", amount=200}, + {type="item", name="fi_crushed_coal_item", amount=10}, + }, + results = { + {type="fluid", name="el_acidic_water", amount=90}, + {type="fluid", name="fi_acid_gas", amount=60}, + {type="fluid", name="heavy-oil", amount=80}, + }, + energy_required = 6, + subgroup = 'fi_item_subgroup_f', + order = 'a-a', + always_show_made_in = true, }, }) \ No newline at end of file diff --git a/ressources/fluids/fi_acid_gas.png b/ressources/fluids/fi_acid_gas.png new file mode 100644 index 0000000..a2cf614 Binary files /dev/null and b/ressources/fluids/fi_acid_gas.png differ diff --git a/ressources/icons/fi_cracking_kerosene.png b/ressources/icons/fi_cracking_kerosene.png new file mode 100644 index 0000000..0c15c5c Binary files /dev/null and b/ressources/icons/fi_cracking_kerosene.png differ diff --git a/ressources/icons/fi_cracking_kerosene_coal.png b/ressources/icons/fi_cracking_kerosene_coal.png new file mode 100644 index 0000000..07ca106 Binary files /dev/null and b/ressources/icons/fi_cracking_kerosene_coal.png differ diff --git a/ressources/icons/fi_refining_basic.png b/ressources/icons/fi_refining_basic.png new file mode 100644 index 0000000..32edbc2 Binary files /dev/null and b/ressources/icons/fi_refining_basic.png differ diff --git a/ressources/icons/fi_refining_coal.png b/ressources/icons/fi_refining_coal.png new file mode 100644 index 0000000..9e2c7ad Binary files /dev/null and b/ressources/icons/fi_refining_coal.png differ diff --git a/ressources/icons/fi_refining_sulfur.png b/ressources/icons/fi_refining_sulfur.png new file mode 100644 index 0000000..3ac52dc Binary files /dev/null and b/ressources/icons/fi_refining_sulfur.png differ diff --git a/ressources/techs/fi_refinery_2_tech.png b/ressources/techs/fi_refinery_2_tech.png new file mode 100644 index 0000000..f5c3cca Binary files /dev/null and b/ressources/techs/fi_refinery_2_tech.png differ diff --git a/ressources/techs/fi_refinery_3_tech.png b/ressources/techs/fi_refinery_3_tech.png new file mode 100644 index 0000000..f75e74d Binary files /dev/null and b/ressources/techs/fi_refinery_3_tech.png differ diff --git a/ressources/techs/fi_refinery_4_tech.png b/ressources/techs/fi_refinery_4_tech.png new file mode 100644 index 0000000..2668af9 Binary files /dev/null and b/ressources/techs/fi_refinery_4_tech.png differ