Merge branch 'pyanodon:main' into Ukranian-Locale

cached-configs/PyBlock+pyalienlife+pyalternativeenergy+pycoalprocessing+pyfusionenergy+pyhightech+pyindustry+pypetroleumhandling+pyrawores.lua

@@ -158,7 +158,7 @@ fix_tech("energy-shield-mk2-equipment",{order="000083",prerequisites={"energy-sh
 fix_tech("solar-panel-equipment",{order="000075",prerequisites={"solar-mk01","modular-armor","electric-energy-distribution-1","lithium-processing"},unit={count=1750,ingredients={{amount=10,name="automation-science-pack",type="item"},{amount=3,name="logistic-science-pack",type="item"},{amount=2,name="py-science-pack-2",type="item"},{amount=1,name="chemical-science-pack",type="item"}},time=120}})
 fix_tech("personal-laser-defense-equipment",{order="000083",prerequisites={"laser-turret","military-3","low-density-structure","power-armor","solar-panel-equipment"},unit={count=1750,ingredients={{amount=20,name="automation-science-pack",type="item"},{amount=6,name="logistic-science-pack",type="item"},{amount=2,name="chemical-science-pack",type="item"},{amount=3,name="military-science-pack",type="item"},{amount=1,name="py-science-pack-3",type="item"},{amount=3,name="py-science-pack-2",type="item"}},time=180}})
 fix_tech("discharge-defense-equipment",{order="000083",prerequisites={"laser-turret","military-3","power-armor","solar-panel-equipment"},unit={count=1750,ingredients={{amount=20,name="automation-science-pack",type="item"},{amount=6,name="logistic-science-pack",type="item"},{amount=2,name="chemical-science-pack",type="item"},{amount=3,name="military-science-pack",type="item"},{amount=1,name="py-science-pack-3",type="item"},{amount=3,name="py-science-pack-2",type="item"}},time=180}})
-fix_tech("fusion-reactor-equipment",{order="000095",prerequisites={"power-armor","fusion-mk02","domestication-mk03","effectivity-module-3"},unit={count=2750,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=6,name="military-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"}},time=300}})
+fix_tech("fusion-reactor-equipment",{order="000095",prerequisites={"power-armor","fusion-mk02","domestication-mk03","efficiency-module-3"},unit={count=2750,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=6,name="military-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"}},time=300}})
 fix_tech("exoskeleton-equipment",{order="000094",prerequisites={"power-armor","machine-components-mk04"},unit={count=2250,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"}},time=300}})
 fix_tech("personal-roboport-equipment",{order="000031",prerequisites={"construction-robotics"},unit={count=200,ingredients={{amount=2,name="automation-science-pack",type="item"},{amount=1,name="py-science-pack-1",type="item"}},time=45}})
 fix_tech("personal-roboport-mk2-equipment",{order="000076",prerequisites={"solar-panel-equipment","personal-roboport-equipment"},unit={count=2000,ingredients={{amount=10,name="automation-science-pack",type="item"},{amount=3,name="logistic-science-pack",type="item"},{amount=1,name="chemical-science-pack",type="item"}},time=120}})
@@ -173,9 +173,9 @@ fix_tech("speed-module-3",{order="000094",prerequisites={"speed-module-2","machi
 fix_tech("productivity-module",{order="000067",prerequisites={"machine-components-mk02"},unit={count=1750,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=1,name="py-science-pack-2",type="item"}},time=90}})
 fix_tech("productivity-module-2",{order="000082",prerequisites={"productivity-module","machine-components-mk03"},unit={count=1600,ingredients={{amount=20,name="automation-science-pack",type="item"},{amount=6,name="logistic-science-pack",type="item"},{amount=2,name="chemical-science-pack",type="item"},{amount=1,name="py-science-pack-3",type="item"},{amount=3,name="py-science-pack-2",type="item"}},time=180}})
 fix_tech("productivity-module-3",{order="000094",prerequisites={"productivity-module-2","machine-components-mk04"},unit={count=2250,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=6,name="military-science-pack",type="item"}},time=300}})
-fix_tech("effectivity-module",{order="000067",prerequisites={"machine-components-mk02"},unit={count=1750,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=1,name="py-science-pack-2",type="item"}},time=90}})
-fix_tech("effectivity-module-2",{order="000082",prerequisites={"effectivity-module","machine-components-mk03"},unit={count=1600,ingredients={{amount=20,name="automation-science-pack",type="item"},{amount=6,name="logistic-science-pack",type="item"},{amount=2,name="chemical-science-pack",type="item"},{amount=1,name="py-science-pack-3",type="item"},{amount=3,name="py-science-pack-2",type="item"}},time=180}})
-fix_tech("effectivity-module-3",{order="000094",prerequisites={"effectivity-module-2","machine-components-mk04"},unit={count=2250,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=6,name="military-science-pack",type="item"}},time=300}})
+fix_tech("efficiency-module",{order="000067",prerequisites={"machine-components-mk02"},unit={count=1750,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=1,name="py-science-pack-2",type="item"}},time=90}})
+fix_tech("efficiency-module-2",{order="000082",prerequisites={"efficiency-module","machine-components-mk03"},unit={count=1600,ingredients={{amount=20,name="automation-science-pack",type="item"},{amount=6,name="logistic-science-pack",type="item"},{amount=2,name="chemical-science-pack",type="item"},{amount=1,name="py-science-pack-3",type="item"},{amount=3,name="py-science-pack-2",type="item"}},time=180}})
+fix_tech("efficiency-module-3",{order="000094",prerequisites={"efficiency-module-2","machine-components-mk04"},unit={count=2250,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"},{amount=6,name="military-science-pack",type="item"}},time=300}})
 fix_tech("defender",{order="000040",prerequisites={"military-science-pack"},unit={count=90,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=1,name="military-science-pack",type="item"}},time=90}})
 fix_tech("distractor",{order="000067",prerequisites={"chemical-science-pack","defender"},unit={count=750,ingredients={{amount=10,name="automation-science-pack",type="item"},{amount=3,name="logistic-science-pack",type="item"},{amount=1,name="chemical-science-pack",type="item"},{amount=2,name="military-science-pack",type="item"}},time=120}})
 fix_tech("destroyer",{order="000098",prerequisites={"military-4","distractor"},unit={count=1500,ingredients={{amount=60,name="automation-science-pack",type="item"},{amount=20,name="logistic-science-pack",type="item"},{amount=6,name="chemical-science-pack",type="item"},{amount=10,name="military-science-pack",type="item"},{amount=2,name="production-science-pack",type="item"},{amount=1,name="py-science-pack-4",type="item"}},time=450}})
@@ -239,7 +239,7 @@ fix_tech("artillery-shell-range-10",{order="000102",prerequisites={"artillery-sh
 fix_tech("artillery-shell-range-11",{order="000103",prerequisites={"artillery-shell-range-10"},unit={count=1000,ingredients={{amount=100,name="automation-science-pack",type="item"},{amount=30,name="logistic-science-pack",type="item"},{amount=20,name="military-science-pack",type="item"},{amount=10,name="chemical-science-pack",type="item"},{amount=3,name="production-science-pack",type="item"},{amount=1,name="utility-science-pack",type="item"}},time=600}})
 fix_tech("artillery-shell-range-12",{order="000104",prerequisites={"artillery-shell-range-11"},unit={count=1100,ingredients={{amount=100,name="automation-science-pack",type="item"},{amount=30,name="logistic-science-pack",type="item"},{amount=20,name="military-science-pack",type="item"},{amount=10,name="chemical-science-pack",type="item"},{amount=3,name="production-science-pack",type="item"},{amount=1,name="utility-science-pack",type="item"}},time=600}})
 fix_tech("artillery-shell-range-13",{order="000105",prerequisites={"artillery-shell-range-12","quantum"},unit={count=500,ingredients={{amount=200,name="automation-science-pack",type="item"},{amount=60,name="logistic-science-pack",type="item"},{amount=30,name="military-science-pack",type="item"},{amount=20,name="chemical-science-pack",type="item"},{amount=6,name="production-science-pack",type="item"},{amount=2,name="utility-science-pack",type="item"},{amount=1,name="space-science-pack",type="item"}},time=1200}})
-fix_tech("diet-beacon",{order="000069",prerequisites={"speed-module","productivity-module","effectivity-module","chemical-science-pack","wind-mk02"},unit={count=900,ingredients={{amount=10,name="automation-science-pack",type="item"},{amount=3,name="logistic-science-pack",type="item"},{amount=1,name="chemical-science-pack",type="item"},{amount=6,name="py-science-pack-1",type="item"},{amount=2,name="py-science-pack-2",type="item"}},time=120}})
+fix_tech("diet-beacon",{order="000069",prerequisites={"speed-module","productivity-module","efficiency-module","chemical-science-pack","wind-mk02"},unit={count=900,ingredients={{amount=10,name="automation-science-pack",type="item"},{amount=3,name="logistic-science-pack",type="item"},{amount=1,name="chemical-science-pack",type="item"},{amount=6,name="py-science-pack-1",type="item"},{amount=2,name="py-science-pack-2",type="item"}},time=120}})
 fix_tech("advanced-mining-facilities",{order="000047",prerequisites={"vanadium-processing"},unit={count=500,ingredients={{amount=3,name="automation-science-pack",type="item"},{amount=1,name="logistic-science-pack",type="item"}},time=60}})
 fix_tech("sc-unit",{order="000082",prerequisites={"production-science-pack","machine-components-mk03"},unit={count=600,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"}},time=300}})
 fix_tech("fusion-mk01",{order="000085",prerequisites={"helium-processing-mk02","sc-unit"},unit={count=900,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=1,name="production-science-pack",type="item"}},time=300}})
@@ -873,7 +873,7 @@ fix_tech("arqad-upgrade",{order="000046",prerequisites={"arqad"},unit={count=360
 fix_tech("arthurian-upgrade",{order="000086",prerequisites={"arthurian-mk02"},unit={count=4000,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=6,name="military-science-pack",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"},{amount=1,name="production-science-pack",type="item"}},time=300}})
 fix_tech("atomizer-upgrade",{order="000106",prerequisites={"molecular-decohesion-mk04","biotech-machines-mk04"},unit={count=2800,ingredients={{amount=100,name="automation-science-pack",type="item"},{amount=60,name="py-science-pack-1",type="item"},{amount=30,name="logistic-science-pack",type="item"},{amount=20,name="military-science-pack",type="item"},{amount=20,name="py-science-pack-2",type="item"},{amount=10,name="chemical-science-pack",type="item"},{amount=6,name="py-science-pack-3",type="item"},{amount=3,name="production-science-pack",type="item"},{amount=2,name="py-science-pack-4",type="item"},{amount=1,name="utility-science-pack",type="item"}},time=600}})
 fix_tech("auog-upgrade",{order="000059",prerequisites={"auog-mk02"},unit={count=5250,ingredients={{amount=6,name="automation-science-pack",type="item"},{amount=3,name="py-science-pack-1",type="item"},{amount=2,name="logistic-science-pack",type="item"},{amount=1,name="py-science-pack-2",type="item"}},time=90}})
-fix_tech("bhoddos-upgrade",{order="000083",prerequisites={"bhoddos-mk02","effectivity-module-2"},unit={count=8750,ingredients={{amount=20,name="automation-science-pack",type="item"},{amount=6,name="logistic-science-pack",type="item"},{amount=3,name="py-science-pack-2",type="item"},{amount=2,name="chemical-science-pack",type="item"},{amount=1,name="py-science-pack-3",type="item"}},time=180}})
+fix_tech("bhoddos-upgrade",{order="000083",prerequisites={"bhoddos-mk02","efficiency-module-2"},unit={count=8750,ingredients={{amount=20,name="automation-science-pack",type="item"},{amount=6,name="logistic-science-pack",type="item"},{amount=3,name="py-science-pack-2",type="item"},{amount=2,name="chemical-science-pack",type="item"},{amount=1,name="py-science-pack-3",type="item"}},time=180}})
 fix_tech("biofactory-upgrade",{order="000075",prerequisites={"py-science-pack-mk03"},unit={count=3500,ingredients={{amount=20,name="automation-science-pack",type="item"},{amount=6,name="logistic-science-pack",type="item"},{amount=3,name="py-science-pack-2",type="item"},{amount=2,name="chemical-science-pack",type="item"},{amount=1,name="py-science-pack-3",type="item"}},time=180}})
 fix_tech("bioprinting-upgrade",{order="000083",prerequisites={"organ-printing-mk02"},unit={count=2800,ingredients={{amount=30,name="automation-science-pack",type="item"},{amount=20,name="py-science-pack-1",type="item"},{amount=10,name="logistic-science-pack",type="item"},{amount=6,name="py-science-pack-2",type="item"},{amount=3,name="chemical-science-pack",type="item"},{amount=2,name="py-science-pack-3",type="item"},{amount=1,name="production-science-pack",type="item"}},time=300}})
 fix_tech("bioreactor-upgrade",{order="000103",prerequisites={"mass-production","thermal-mk04"},unit={count=2000,ingredients={{amount=100,name="automation-science-pack",type="item"},{amount=60,name="py-science-pack-1",type="item"},{amount=30,name="logistic-science-pack",type="item"},{amount=20,name="military-science-pack",type="item"},{amount=20,name="py-science-pack-2",type="item"},{amount=10,name="chemical-science-pack",type="item"},{amount=6,name="py-science-pack-3",type="item"},{amount=3,name="production-science-pack",type="item"},{amount=2,name="py-science-pack-4",type="item"},{amount=1,name="utility-science-pack",type="item"}},time=600}})

changelog.txt

@@ -1,8 +1,14 @@
 ---------------------------------------------------------------------------------------------------
+Version: 3.0.9
+Date: 2024-10-30
+  Changes:
+    - Removed temporary technologies from PyBlock
+---------------------------------------------------------------------------------------------------
 Version: 3.0.8
-Date: 403 forbidden
+Date: 2024-10-29
   Changes:
     - Renai Transportation technology fix.
+    - Removed ash
 ---------------------------------------------------------------------------------------------------
 Version: 3.0.7
 Date: 2024-10-22

data-final-fixes.lua

@@ -172,45 +172,6 @@ for category_name, proto in pairs(data.raw["resource-category"]) do
 end
 -- End resource category locale builder
 
-local function create_tmp_tech(recipe, original_tech, add_dependency)
-    local new_tech = TECHNOLOGY {
-        type = "technology",
-        name = "tmp-" .. recipe .. "-tech",
-        icon = "__pypostprocessing__/graphics/placeholder.png",
-        icon_size = 128,
-        order = "c-a",
-        prerequisites = {},
-        effects = {
-            {type = "unlock-recipe", recipe = recipe}
-        },
-        unit = {
-            count = 30,
-            ingredients = {
-                {"automation-science-pack", 1}
-            },
-            time = 30
-        }
-    }
-
-    recipe.enabled = false
-
-    if original_tech then
-        recipe:remove_unlock(original_tech)
-
-        if add_dependency then
-            new_tech.dependencies = {original_tech}
-        end
-    end
-
-    return new_tech
-end
-
-if mods["PyBlock"] then
-    create_tmp_tech("fake-bioreserve-ore")
-    --aluminium
-    create_tmp_tech("borax-mine", "glass")
-end
-
 if mods.pycoalprocessing and not mods["extended-descriptions"] then
     for _, recipe in pairs(data.raw.recipe) do
         if recipe.allow_productivity then

info.json

@@ -1,6 +1,6 @@
 {
   "name": "pypostprocessing",
-  "version": "3.0.7",
+  "version": "3.0.9",
   "factorio_version": "2.0",
   "title": "Pyanodons Post-processing",
   "author": "Pyanodon, Shadowglass",

prototypes/next-upgrades.lua

@@ -28,6 +28,7 @@ local function check_for_valid_minable_properties(entity)
 
     local minable = entity.minable
     if not minable.result and not minable.results then return false end
+    if minable.results and table_size(minable.results) >= 0 then return false end
     local minable_result = minable.result or minable.results[1].name or minable.results[1][1]
     if not minable_result then return false end
     if minable_result ~= entity.name then return false end
@@ -46,7 +47,7 @@ local function can_be_upgraded(entity)
     if not entity then return false end
     if entity.hidden then return false end
     if entity.joint_distance then return false end -- Exclude all trains.
-    if entity:has_flag("not-upgradable") then return false end
+    if ENTITY(entity):has_flag("not-upgradable") then return false end
     if not entity.fast_replaceable_group then return false end
     if not entity.collision_box then return false end
     if not check_for_valid_minable_properties(entity) then return false end