From 421d048c181bc986ab83ba25b383ec8fc8df2e96 Mon Sep 17 00:00:00 2001 From: PreLeyZero Date: Tue, 26 Apr 2022 21:09:20 +0200 Subject: [PATCH] varios balance changes --- changelog.txt | 12 ++++++ data.lua | 4 ++ prototypes/248k_techs.lua | 4 -- prototypes/el_recipes.lua | 17 ++++---- prototypes/fi_recipes.lua | 22 +++++----- prototypes/fission/fi_robo.lua | 4 +- prototypes/fu_recipes.lua | 16 +------- scripts/umr/data.lua | 73 ++++++++++++++++++++++++++++++++++ 8 files changed, 111 insertions(+), 41 deletions(-) create mode 100644 scripts/umr/data.lua diff --git a/changelog.txt b/changelog.txt index aea012c..6b597c2 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,16 @@ --------------------------------------------------------------------------------------------------- +Version: 1.0.15 +Date: 26.4.2022 + Changes: + - reduced roboport hitboxes + - reduced overall steam usage (esp. for ceramics and oil production) + - fixed purification ratio for advanced purification + - nuclear waste storage is now cheaper aswell as of silo tank + - decreased dirty water usage for lithium and fluorite + + Bugfixes: + - fixed blackhole desync and KI beacon update (by x2605) +--------------------------------------------------------------------------------------------------- Version: 1.0.14 Date: 20.4.2022 Features: diff --git a/data.lua b/data.lua index b2c4f7a..67614fc 100644 --- a/data.lua +++ b/data.lua @@ -107,6 +107,10 @@ end if mods["space-exploration"] then require('scripts/SE/data') end +--UMR +if mods["umr"] then + require('scripts/umr/data') +end data:extend({ { diff --git a/prototypes/248k_techs.lua b/prototypes/248k_techs.lua index c99c763..a99945e 100644 --- a/prototypes/248k_techs.lua +++ b/prototypes/248k_techs.lua @@ -1958,10 +1958,6 @@ data:extend({ type = 'unlock-recipe', recipe = 'fu_fusion_card_2_recipe', }, - { - type = 'unlock-recipe', - recipe = 'fu_fusion_card_3_recipe', - }, { type = 'unlock-recipe', recipe = 'fu_fusion_card_4_recipe', diff --git a/prototypes/el_recipes.lua b/prototypes/el_recipes.lua index a5a95f7..ef1ca0d 100644 --- a/prototypes/el_recipes.lua +++ b/prototypes/el_recipes.lua @@ -166,7 +166,7 @@ data:extend({ main_product = 'el_kerosene', ingredients = { {type="fluid", name="crude-oil", amount=160}, - {type="fluid", name="steam", amount=100}, + {type="fluid", name="steam", amount=60}, }, results = { {type="fluid", name="el_kerosene", amount=120}, @@ -182,10 +182,9 @@ data:extend({ enabled = 'false', category = 'crafting', ingredients = { - {'pipe',100}, - {'electronic-circuit',60}, - {'steel-plate', 200}, - {'el_aluminum_item',400}, + {'storage-tank', 4}, + {'steel-plate', 50}, + {'el_aluminum_item', 150}, }, result = 'el_tank_item', result_count = 1, @@ -1014,10 +1013,10 @@ data:extend({ category = 'crafting-with-fluid', main_product = 'el_lithium_item', ingredients = { - {type="fluid", name="el_dirty_water", amount=100}, + {type="fluid", name="el_dirty_water", amount=50}, }, results = { - {type="fluid", name="water", amount=100}, + {type="fluid", name="water", amount=50}, {type="item", name="el_lithium_item", amount=1}, }, energy_required = 0.2, @@ -1138,7 +1137,7 @@ data:extend({ enabled = 'false', category = 'crafting-with-fluid', ingredients = { - {type="fluid", name="steam", amount=100}, + {type="fluid", name="steam", amount=60}, {type="item", name="stone", amount=2}, }, results = { @@ -1230,7 +1229,7 @@ data:extend({ main_product = 'el_kerosene', ingredients = { {type="fluid", name="crude-oil", amount=200}, - {type="fluid", name="steam", amount=100}, + {type="fluid", name="steam", amount=80}, }, results = { {type="fluid", name="el_kerosene", amount=140}, diff --git a/prototypes/fi_recipes.lua b/prototypes/fi_recipes.lua index f2b8d8a..731a315 100644 --- a/prototypes/fi_recipes.lua +++ b/prototypes/fi_recipes.lua @@ -29,7 +29,7 @@ data:extend({ type = 'recipe', enabled = 'false', ingredients = { - {'concrete',100}, + {'concrete',50}, {'fi_materials_GFK',40}, {'el_tank_item',1} }, @@ -806,10 +806,10 @@ data:extend({ category = 'crafting-with-fluid', main_product = 'fi_materials_flourite', ingredients = { - {type="fluid", name="el_dirty_water", amount=100}, + {type="fluid", name="el_dirty_water", amount=50}, }, results = { - {type="fluid", name="water", amount=100}, + {type="fluid", name="water", amount=50}, {type="item", name="fi_materials_flourite", amount=1}, }, energy_required = 0.2, @@ -865,7 +865,7 @@ data:extend({ {type="fluid", name="fi_strong_acid", amount=800}, {type="fluid", name="water", amount=200}, --{type="fluid", name="steam", amount=240, temperature=165}, - {type="item", name="iron-ore", amount=40} + {type="item", name="iron-ore", amount=80} }, results = { {type="fluid", name="fi_dirty_water", amount=200}, @@ -885,7 +885,7 @@ data:extend({ {type="fluid", name="fi_strong_acid", amount=800}, {type="fluid", name="water", amount=200}, --{type="fluid", name="steam", amount=240, temperature=165}, - {type="item", name="copper-ore", amount=40} + {type="item", name="copper-ore", amount=80} }, results = { {type="fluid", name="fi_dirty_water", amount=200}, @@ -1231,7 +1231,7 @@ data:extend({ icon_size = 64, ingredients = { {type="fluid", name="crude-oil", amount=180}, - {type="fluid", name="steam", amount=100}, + {type="fluid", name="steam", amount=80}, }, results = { {type="fluid", name="petroleum-gas", amount=80}, @@ -1253,7 +1253,7 @@ data:extend({ icon_size = 64, ingredients = { {type="fluid", name="crude-oil", amount=180}, - {type="fluid", name="steam", amount=100}, + {type="fluid", name="steam", amount=80}, {type="item", name="fi_crushed_coal_item", amount=10}, }, results = { @@ -1276,7 +1276,7 @@ data:extend({ icon_size = 64, ingredients = { {type="fluid", name="crude-oil", amount=180}, - {type="fluid", name="steam", amount=100}, + {type="fluid", name="steam", amount=80}, {type="item", name="sulfur", amount=3}, }, results = { @@ -1298,10 +1298,10 @@ data:extend({ main_product = 'sulfur', ingredients = { {type="fluid", name="fi_acid_gas", amount=10}, - {type="fluid", name="steam", amount=20}, + {type="fluid", name="steam", amount=10}, }, results = { - {type="fluid", name="water", amount=15}, + {type="fluid", name="water", amount=5}, {type="item", name="sulfur", amount=1}, }, energy_required = 0.5, @@ -1317,7 +1317,7 @@ data:extend({ main_product = 'el_acidic_water', ingredients = { {type="fluid", name="fi_acid_gas", amount=20}, - {type="fluid", name="steam", amount=20}, + {type="fluid", name="steam", amount=10}, }, results = { {type="fluid", name="el_acidic_water", amount=20}, diff --git a/prototypes/fission/fi_robo.lua b/prototypes/fission/fi_robo.lua index 608ffe9..b4db9d7 100644 --- a/prototypes/fission/fi_robo.lua +++ b/prototypes/fission/fi_robo.lua @@ -43,7 +43,7 @@ data:extend({ flags = {"player-creation","placeable-neutral"}, max_health = 300, corpse = 'big-remnants', - collision_box = {{-1.4,-1.4},{1.4,1.4}}, + collision_box = {{-1.3,-1.3},{1.3,1.3}}, selection_box = {{-1.5,-1.5},{1.5,1.5}}, map_color = {r=0, g=0, b=1, a=1}, minable = { @@ -134,7 +134,7 @@ data:extend({ flags = {"player-creation","placeable-neutral"}, max_health = 300, corpse = 'big-remnants', - collision_box = {{-1.4,-1.4},{1.4,1.4}}, + collision_box = {{-1.3,-1.3},{1.3,1.3}}, selection_box = {{-1.5,-1.5},{1.5,1.5}}, map_color = {r=0, g=0, b=1, a=1}, minable = { diff --git a/prototypes/fu_recipes.lua b/prototypes/fu_recipes.lua index ac0e1bb..425f148 100644 --- a/prototypes/fu_recipes.lua +++ b/prototypes/fu_recipes.lua @@ -117,20 +117,6 @@ data:extend({ energy_required = 100, always_show_made_in = true, }, - { - name = 'fu_fusion_card_3_recipe', - type = 'recipe', - category = 'fu_fusor_crafting_category', - enabled = 'false', - ingredients = { - {type="fluid", name="fu_lithium_6", amount=100}, - {type="fluid", name="fu_helium_3", amount=100}, - }, - result = 'fu_materials_fusion_card', - result_count = 100, - energy_required = 100, - always_show_made_in = true, - }, { name = 'fu_fusion_card_4_recipe', type = 'recipe', @@ -1293,7 +1279,7 @@ data:extend({ enabled = 'false', category = 'chemistry', ingredients = { - {type="fluid", name="steam", amount=300}, + {type="fluid", name="steam", amount=100}, {type="item", name="el_aluminum_item", amount=4}, }, results = { diff --git a/scripts/umr/data.lua b/scripts/umr/data.lua new file mode 100644 index 0000000..e26e5b5 --- /dev/null +++ b/scripts/umr/data.lua @@ -0,0 +1,73 @@ +data:extend({ + { + name = 'fu_fusor_tech', + type = 'technology', + icon = sprite('fu_fusor_tech.png'), + icon_size = 128, + prerequisites = { + 'fu_magnet_tech','fu_basic_elements_tech' + }, + effects = { + { + type = 'unlock-recipe', + recipe = 'fu_fusor_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fu_fusion_card_1_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fu_fusion_card_2_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fu_fusion_card_3_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fu_fusion_card_4_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fu_fusion_card_5_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fu_fusion_card_6_recipe', + }, + { + type = 'unlock-recipe', + recipe = 'fu_fusion_card_7_recipe', + }, + { + type = 'nothing', + effect_description = {'description.fu_fusor_eff'}, + }, + }, + unit = { + count = '400', + ingredients = { + {'chemical-science-pack',1}, + {'automation-science-pack',1}, + {'logistic-science-pack',1}, + {'utility-science-pack',1} + }, + time = 45, + }, + }, + { + name = 'fu_fusion_card_3_recipe', + type = 'recipe', + category = 'fu_fusor_crafting_category', + enabled = 'false', + ingredients = { + {type="fluid", name="fu_lithium_6", amount=100}, + {type="fluid", name="fu_helium_3", amount=100}, + }, + result = 'fu_materials_fusion_card', + result_count = 100, + energy_required = 100, + always_show_made_in = true, + }, +}) \ No newline at end of file