diff --git a/MilesBobsExpansion/prototypes/assembly-electronics.lua b/MilesBobsExpansion/prototypes/assembly-electronics.lua index c9afe80a..f5caf996 100644 --- a/MilesBobsExpansion/prototypes/assembly-electronics.lua +++ b/MilesBobsExpansion/prototypes/assembly-electronics.lua @@ -130,7 +130,7 @@ data:extend( idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, apparent_volume = 1.5, }, - crafting_categories = {"electronics", "electronics-machine"}, + crafting_categories = {"electronics", "electronics-machine", "electronics-with-fluid"}, crafting_speed = 6, energy_source = { @@ -364,7 +364,7 @@ data:extend( idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 }, apparent_volume = 1.5, }, - crafting_categories = {"electronics", "electronics-machine"}, + crafting_categories = {"electronics", "electronics-machine", "electronics-with-fluid"}, crafting_speed = 8, energy_source = { diff --git a/Oberhaul/prototypes/scienceoberhaul.lua b/Oberhaul/prototypes/scienceoberhaul.lua index 39ee5884..9ff9b56f 100644 --- a/Oberhaul/prototypes/scienceoberhaul.lua +++ b/Oberhaul/prototypes/scienceoberhaul.lua @@ -132,7 +132,7 @@ end if mods["miniloader"] then data.raw.technology["basic-miniloader"].unit = {count=250,ingredients={{"automation-science-pack",1}},time=60} - data.raw.technology["miniloader"].unit = {count=500,ingredients={{"automation-science-pack",1}},time=60} + data.raw.technology["miniloader"].unit = {count=500,ingredients={{"automation-science-pack",1}},time=60} data.raw.technology["fast-miniloader"].unit = {count=1000,ingredients={{"automation-science-pack",1},{"logistic-science-pack", 1}},time=60} data.raw.technology["express-miniloader"].unit = {count=2000,ingredients={{"automation-science-pack",1},{"logistic-science-pack", 2},{"chemical-science-pack", 1}},time=60} data.raw.technology["turbo-miniloader"].unit = {count=3000,ingredients={{"automation-science-pack",1},{"logistic-science-pack", 2},{"chemical-science-pack", 1},{"advanced-logistic-science-pack", 1}},time=60} diff --git a/aai-industry/prototypes/entity/entity-burner-turbine.lua b/aai-industry/prototypes/entity/entity-burner-turbine.lua index 9fbc1d5f..ab83989c 100644 --- a/aai-industry/prototypes/entity/entity-burner-turbine.lua +++ b/aai-industry/prototypes/entity/entity-burner-turbine.lua @@ -14,7 +14,7 @@ local layers = { priority = "extra-high", line_length = 4, frame_count = 8, - animation_speed = 0.5, + animation_speed = 0.6, width = 540/4, height = 300/2, shift = util.by_pixel(0, -10), @@ -23,7 +23,7 @@ local layers = { priority = "extra-high", line_length = 4, frame_count = 8, - animation_speed = 0.5, + animation_speed = 0.6, width = 540/2, height = 300, shift = util.by_pixel(0, -10), @@ -56,7 +56,7 @@ local fire_glow = { priority = "extra-high", line_length = 4, frame_count = 8, - animation_speed = 1, + animation_speed = 0.6, width = 540/4, height = 300/2, shift = util.by_pixel(0, -10), @@ -67,7 +67,7 @@ local fire_glow = { priority = "extra-high", line_length = 4, frame_count = 8, - animation_speed = 1, + animation_speed = 0.6, width = 540/2, height = 300, shift = util.by_pixel(0, -10), @@ -81,7 +81,7 @@ local fire_light = { priority = "extra-high", line_length = 4, frame_count = 8, - animation_speed = 1, + animation_speed = 0.6, width = 540/4, height = 300/2, shift = util.by_pixel(0, -10), @@ -92,7 +92,7 @@ local fire_light = { priority = "extra-high", line_length = 4, frame_count = 8, - animation_speed = 1, + animation_speed = 0.6, width = 540/2, height = 300, shift = util.by_pixel(0, -10), diff --git a/angelsrefining/prototypes/override/refining-override-sorting.lua b/angelsrefining/prototypes/override/refining-override-sorting.lua index 183faa4a..e5a1d445 100644 --- a/angelsrefining/prototypes/override/refining-override-sorting.lua +++ b/angelsrefining/prototypes/override/refining-override-sorting.lua @@ -516,9 +516,9 @@ OV.patch_recipes(merge_table_of_tables({ and create_sorting_recipes("ferrous", "angelsore8%s", { ["!!"] = not special_vanilla and { true, true, true, true }, ["iron-ore"] = not special_vanilla and { 2, 3, 6, 12 }, - ["manganese-ore"] = not special_vanilla and { 2, 2, 2, 6 }, - ["nickel-ore"] = not special_vanilla and { 0, 1, 1, 3 }, - ["cobalt-ore"] = not special_vanilla and { 0, 0, 1, 2 }, + ["manganese-ore"] = not special_vanilla and { 2, 2, 2, 8 }, + ["nickel-ore"] = not special_vanilla and { 0, 1, 1, 6 }, + ["cobalt-ore"] = not special_vanilla and { 0, 0, 1, 3 }, ["chrome-ore"] = not special_vanilla and { 0, 0, 0, 1 }, }, true) or nil, @@ -527,9 +527,9 @@ OV.patch_recipes(merge_table_of_tables({ and create_sorting_recipes("cupric", "angelsore9%s", { ["!!"] = not special_vanilla and { true, true, true, true }, ["copper-ore"] = not special_vanilla and { 2, 3, 6, 12 }, - ["tin-ore"] = not special_vanilla and { 2, 2, 2, 6 }, - ["silver-ore"] = not special_vanilla and { 0, 1, 1, 3 }, - ["gold-ore"] = not special_vanilla and { 0, 0, 1, 2 }, + ["tin-ore"] = not special_vanilla and { 2, 2, 2, 8 }, + ["silver-ore"] = not special_vanilla and { 0, 1, 1, 6 }, + ["gold-ore"] = not special_vanilla and { 0, 0, 1, 3 }, ["platinum-ore"] = not special_vanilla and { 0, 0, 0, 1 }, ["quartz"] = not (special_vanilla or ore_enabled("platinum-ore")) and { 0, 0, 0, 1 }, }, true) diff --git a/zzzparanoidal/info.json b/zzzparanoidal/info.json index 8c7581bf..f34c7178 100644 --- a/zzzparanoidal/info.json +++ b/zzzparanoidal/info.json @@ -1,12 +1,12 @@ { "name": "zzzparanoidal", - "version": "7.1.2", + "version": "8.0.0", "title": "!_Paranoidal", "factorio_version": "1.1", "author": "Sovigod", "contact": "https://discord.gg/MnXGAmC", "homepage": "https://discord.gg/MnXGAmC", - "description": "PARANOIDAL 8 - RC1. Core mod for PARANOIDAL\n2024.08", + "description": "PARANOIDAL 8. Core mod for PARANOIDAL\n2024.09", "dependencies": [ "base >= 1.1.100", "boblibrary", diff --git a/zzzparanoidal/prototypes/micro-final-fix.lua b/zzzparanoidal/prototypes/micro-final-fix.lua index 1eea4960..f25adf78 100644 --- a/zzzparanoidal/prototypes/micro-final-fix.lua +++ b/zzzparanoidal/prototypes/micro-final-fix.lua @@ -1502,7 +1502,7 @@ data.raw["pump"]["offshore-mk2-pump-output"].energy_usage = "2000kW" data.raw["offshore-pump"]["offshore-mk2-pump"].pumping_speed = 40 data.raw.pump["offshore-mk2-pump-output"].pumping_speed = data.raw["offshore-pump"]["offshore-mk2-pump"].pumping_speed data.raw["item"]["offshore-mk2-pump"].order = "b[fluids]-c[offshore-mk2-pump]" -bobmods.lib.recipe.set_ingredients("offshore-mk2-pump", { { "steel-pipe", 5 }, { "advanced-circuit", 2 }, { "steel-gear-wheel", 10 } }) +bobmods.lib.recipe.set_ingredients("offshore-mk2-pump", { { "steel-pipe", 5 }, { "advanced-circuit", 2 }, { "steel-gear-wheel", 10 }, { "offshore-mk1-pump", 1} }) data.raw["technology"]["offshore-mk2-pump"].prerequisites = {"advanced-electronics", "bob-fluid-handling-2"} --offshore-3 data.raw['item']["offshore-mk3-pump"].place_result = "offshore-mk3-pump" @@ -1510,7 +1510,7 @@ data.raw["pump"]["offshore-mk3-pump-output"].energy_usage = "2800kW" data.raw["offshore-pump"]["offshore-mk3-pump"].pumping_speed = 60 data.raw.pump["offshore-mk3-pump-output"].pumping_speed = data.raw["offshore-pump"]["offshore-mk3-pump"].pumping_speed data.raw["item"]["offshore-mk3-pump"].order = "b[fluids]-c[offshore-mk3-pump]" -bobmods.lib.recipe.set_ingredients("offshore-mk3-pump", { { "titanium-pipe", 5 }, { "advanced-circuit", 2 }, { "titanium-gear-wheel", 10 } }) +bobmods.lib.recipe.set_ingredients("offshore-mk3-pump", { { "titanium-pipe", 5 }, { "advanced-circuit", 2 }, { "titanium-gear-wheel", 10 }, { "offshore-mk2-pump", 1} }) data.raw["technology"]["offshore-mk3-pump"].prerequisites = {"offshore-mk2-pump", "advanced-electronics", "angels-titanium-smelting-1"} data.raw["technology"]["offshore-mk3-pump"].prerequisites = {"advanced-electronics", "bob-fluid-handling-2"} --offshore-4 @@ -1519,7 +1519,7 @@ data.raw["pump"]["offshore-mk4-pump-output"].energy_usage = "3700kW" data.raw["offshore-pump"]["offshore-mk4-pump"].pumping_speed = 80 data.raw.pump["offshore-mk4-pump-output"].pumping_speed = data.raw["offshore-pump"]["offshore-mk4-pump"].pumping_speed data.raw["item"]["offshore-mk4-pump"].order = "b[fluids]-c[offshore-mk4-pump]" -bobmods.lib.recipe.set_ingredients("offshore-mk4-pump", { { "titanium-pipe", 5 }, { "advanced-circuit", 2 }, { "titanium-gear-wheel", 10 } }) +bobmods.lib.recipe.set_ingredients("offshore-mk4-pump", { { "titanium-pipe", 5 }, { "advanced-circuit", 2 }, { "titanium-gear-wheel", 10 }, { "offshore-mk3-pump", 1} }) data.raw["technology"]["offshore-mk4-pump"].prerequisites = {"offshore-mk3-pump", "advanced-electronics-2", "advanced-electronics-3"} data.raw.technology["offshore-mk4-pump"].unit.ingredients = {{"automation-science-pack", 1}, {"logistic-science-pack", 1}, {"chemical-science-pack", 1}, {"production-science-pack", 1}} --seafloor pumps коррекция скорости помпы