Merge pull request #193 from pyanodon/2.1-prep

update for 2.1

Author: oorzkws

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

@@ -1,4 +1,46 @@
 ---------------------------------------------------------------------------------------------------
+Version: 3.2.0
+Date: ???
+  Breaking Changes:
+    - Updated tidal powerplants to be solar panels modulated by surface properties, similar to wind turbines, adding variance to the output.
+    - Fixed incorrect temperature requirements from rounding in low-temperature uranium hexafluoride recipes
+    - Moved oleochemical input on on rubber-from-oleochemicals to south fluidbox for consistency with other rubber recipes. Reolves https://github.com/pyanodon/pybugreports/issues/1500
+    - [space-age] Fixed that uranium separation was not properly updated when decay was enabled. The recipe should be outputting ash, not using it...
+    - Nerfed uranium separation (without decay) to output u-238 67.5% of the time instead of 95% of the time (see below for relevant buffs)
+  Changes:
+    - Updated to Factorio 2.1
+    - Removed unnecessary prototype values to clear up the log
+    - Updated vector_to_place_result so items shouldn't drop on the floor. Resolves https://github.com/pyanodon/pybugreports/issues/1486
+    - Fixed that many buildings did not have certain pipe covers rendered
+    - Fixed that molten salt thermosolar would consume more energy the hotter the molten salt, without producing any more output. Resolves https://github.com/pyanodon/pybugreports/issues/1438
+    - Updated wind turbines to be solar panels modulated by surface properties instead of individual EEIs, significantly increasing performance. Resolves https://github.com/pyanodon/pybugreports/issues/499
+    - Converted solar panel mk02/mk03 to stateless visualizations from LuaRendering, increasing performance.
+    - Converted VAWTs to stateless visualizations from LuaRendering, increasing performance.
+    - Buffed VAWT Mk01 power output from 4MW to 4.8MW, on average
+    - Buffed VAWT Mk02 power output from 20MW to 24MW, on average
+    - Buffed VAWT Mk03 power output from 50MW to 150MW, on average
+    - Buffed VAWT Mk04 power output from 85MW to 270MW, on average
+    - Buffed HAWT Mk01 power output from 5MW to 6MW, on average
+    - Buffed HAWT Mk02 power output from 25MW to 30MW, on average
+    - Buffed HAWT Mk03 power output from 50MW to 150MW, on average
+    - Buffed HAWT Mk04 power output from 80MW to 240MW, on average
+    - Buffed Multiblade Mk01 power output from 550kW to 1.2MW, on average
+    - Buffed Multiblade Mk03 power output from 34MW to 90MW, on average
+    - Fixed that tidal powerplant collisions were larger than their visual area. Resolves https://github.com/pyanodon/pybugreports/issues/1428
+    - Fixed that tidal powerplant animations did not work.
+    - Buffed Tidal Mk01 power output from a constant 6MW to 8MW on average
+    - Buffed Tidal Mk02 power output from a constant 40MW to 60MW on average
+    - Buffed Tidal Mk03 power output from a constant 90MW to 160MW on average
+    - Buffed Tidal Mk04 power output from a constant 400MW to 500MW on average
+    - Fixed that the antisolar animation did not work
+    - Nuclear isotope processing recipes will inherit their decay state from ingredients where possible. Resolves https://github.com/pyanodon/pybugreports/issues/1327
+    - Buffed uranium separation to output 10 u-237 instead of 1
+    - Uranium separation now uses shared probability, so you will always get 10 items out for 10 items consumed
+    - Reduced most fluidbox sizes from 1000 to 100
+    - Returned the passthrough pipe connections to the High Pressure Steam Turbine Mk04
+    - Added the following entities to be hidden when visibility of tall entities is toggled: accumulator mk03, antimony drill, biomass powerplant, oil powerplant, electric boiler, megadar, nuclear reactor mk01 and mk02, simik boiler
+    - Allowed the superior floating locomotive, cargo wagon, and fluid wagon to be used with the upgrade planner to upgrade trains
+---------------------------------------------------------------------------------------------------
 Version: 3.1.38
 Date: 2026-06-08
   Changes:

changelog.txt

@@ -8,7 +8,6 @@ require "scripts/microwave-receiver"
 require "scripts/thermosolar/shared"
 require "scripts/thermosolar/solar-updraft-tower"
 require "scripts/thermosolar/heliostat"
-require "scripts/solar"
 require "scripts/wind/wind"
 require "scripts/aerial"
 require "scripts/tidal"
@@ -32,7 +31,6 @@ py.on_event(py.events.on_init(), function()
 end)
 
 py.on_event(py.events.on_built(), function(event)
-    Solar.events.on_built(event)
     Heliostat.events.on_built(event)
     Wind.events.on_built(event)
     Aerial.events.on_built(event)
@@ -74,26 +72,25 @@ local REQUIRES_SUNLIGHT = {
 }
 
 py.register_on_nth_tick(55, "thermosolar", "pyae", function(event)
-    local active = Thermosolar.calc_daylight(game.surfaces["nauvis"]) > 0.5 -- TODO: fix for multisurface
+    local disabled = Thermosolar.calc_daylight(game.surfaces["nauvis"]) < 0.5 -- TODO: fix for multisurface
     for _, panel in pairs(storage.lrf_panels) do
         if panel.valid then
-            panel.active = active
-            panel.custom_status = (not active) and REQUIRES_SUNLIGHT or nil
+            panel.disabled_by_script = disabled
+            panel.custom_status = disabled and REQUIRES_SUNLIGHT or nil
         end
     end
     for _, panel in pairs(storage.stirling) do
         if panel.valid then
-            panel.active = active
-            panel.custom_status = (not active) and REQUIRES_SUNLIGHT or nil
+            panel.disabled_by_script = disabled
+            panel.custom_status = disabled and REQUIRES_SUNLIGHT or nil
         end
     end
 end)
 
-py.register_on_nth_tick(100, "solar", "pyae", Solar.events[100])
 py.register_on_nth_tick(61, "wind", "pyae", Wind.events[61])
+py.register_on_nth_tick(83, "tidal", "pyae", Tidal.events[83])
 
 py.on_event(py.events.on_destroyed(), function(event)
-    Solar.events.on_destroyed(event)
     Heliostat.events.on_destroyed(event)
     Wind.events.on_destroyed(event)
     Aerial.events.on_destroyed(event)

control.lua

@@ -1,29 +1,29 @@
 require "prototypes.decay.decay-updates"
 
 --MOVED RECIPES CATEGORIES
-RECIPE("honey-comb").category = "centrifuging"
-RECIPE("honey-comb-buffed").category = "centrifuging"
-RECIPE("nickel-tailings").category = "centrifuging"
-RECIPE("xylenol-2").category = "centrifuging"
-RECIPE("al-tailings-separation").category = "centrifuging"
-RECIPE("simik-blood-to-oleochemicals").category = "centrifuging"
-RECIPE("chromite-concentrate").category = "centrifuging"
-RECIPE("vanabins").category = "centrifuging"
-RECIPE("clean-rf-gel").category = "centrifuging"
-RECIPE("gold-precipitate").category = "centrifuging"
-RECIPE("serine").category = "centrifuging"
-RECIPE("albumin-1").category = "centrifuging"
-RECIPE("outlet-gas-02").category = "centrifuging"
-RECIPE("serine").category = "centrifuging"
-RECIPE("tar-to-nickel").category = "centrifuging"
-RECIPE("bitumen-to-nickel").category = "centrifuging"
-RECIPE("nickel-prepared-solution").category = "centrifuging"
-RECIPE("chromium-rejects").category = "centrifuging"
-RECIPE("nuclear-fuel-reprocessing-mk02").category = "centrifuging"
-RECIPE("nuclear-fuel-reprocessing-mk03").category = "centrifuging"
-RECIPE("nuclear-fuel-reprocessing-mk04").category = "centrifuging"
-RECIPE("nuclear-fuel-reprocessing-mk05").category = "centrifuging"
-RECIPE("plutonium-fuel-reprocessing").category = "centrifuging"
+RECIPE("honey-comb").categories = {"centrifuging"}
+RECIPE("honey-comb-buffed").categories = {"centrifuging"}
+RECIPE("nickel-tailings").categories = {"centrifuging"}
+RECIPE("xylenol-2").categories = {"centrifuging"}
+RECIPE("al-tailings-separation").categories = {"centrifuging"}
+RECIPE("simik-blood-to-oleochemicals").categories = {"centrifuging"}
+RECIPE("chromite-concentrate").categories = {"centrifuging"}
+RECIPE("vanabins").categories = {"centrifuging"}
+RECIPE("clean-rf-gel").categories = {"centrifuging"}
+RECIPE("gold-precipitate").categories = {"centrifuging"}
+RECIPE("serine").categories = {"centrifuging"}
+RECIPE("albumin-1").categories = {"centrifuging"}
+RECIPE("outlet-gas-02").categories = {"centrifuging"}
+RECIPE("serine").categories = {"centrifuging"}
+RECIPE("tar-to-nickel").categories = {"centrifuging"}
+RECIPE("bitumen-to-nickel").categories = {"centrifuging"}
+RECIPE("nickel-prepared-solution").categories = {"centrifuging"}
+RECIPE("chromium-rejects").categories = {"centrifuging"}
+RECIPE("nuclear-fuel-reprocessing-mk02").categories = {"centrifuging"}
+RECIPE("nuclear-fuel-reprocessing-mk03").categories = {"centrifuging"}
+RECIPE("nuclear-fuel-reprocessing-mk04").categories = {"centrifuging"}
+RECIPE("nuclear-fuel-reprocessing-mk05").categories = {"centrifuging"}
+RECIPE("plutonium-fuel-reprocessing").categories = {"centrifuging"}
 
 --adjusting all centrifudge recipe speeds
 RECIPE("uranium-processing"):set_fields {energy_required = 40}
@@ -65,7 +65,7 @@ data.raw.technology["pyrrhic"]:add_prereq("biotech-machines-mk04")
 RECIPE {
     type = "recipe",
     name = "solvent-separation",
-    category = "centrifuging",
+    categories = {"centrifuging"},
     enabled = false,
     energy_required = 20,
     ingredients = {
@@ -125,8 +125,8 @@ RECIPE("py-logistic-robot-mk04"):add_ingredient {type = "item", name = "gearbox-
 RECIPE("py-construction-robot-mk01"):add_ingredient {type = "item", name = "battery-mk01", amount = 2}
 RECIPE("py-logistic-robot-mk01"):add_ingredient {type = "item", name = "battery-mk01", amount = 2}
 
-RECIPE("subcritical-water-01").category = "heat-exchanger"
-RECIPE("subcritical-water-02").category = "heat-exchanger"
+RECIPE("subcritical-water-01").categories = {"heat-exchanger"}
+RECIPE("subcritical-water-02").categories = {"heat-exchanger"}
 
 for _, recipe in pairs(data.raw.recipe) do
     recipe:replace_ingredient("battery", "battery-mk01")
@@ -150,49 +150,31 @@ end
 
 --ENERGY COSTS--
 
---ENERGY PRODUCTION DESCRIPTION --
-for name, variance in pairs(require "scripts.wind.variation") do
-    variance = {"entity-description.variance", tostring(variance * 100)}
-    -- Handle the surrogate items that show in electric stats, too
-    for _, suffix in pairs {"", "-blank"} do
-        local entity = data.raw["electric-energy-interface"][name .. suffix]
-        if entity then
-            if entity.localised_description then
-                entity.localised_description = {"", entity.localised_description, "\n", variance}
-            else
-                entity.localised_description = {"?", {"", {"entity-description." .. name}, "\n", variance}, variance}
-            end
-        end
-    end
-end
-
-local electric_energy_interfaces = {
+-- add wind data to entity tooltip fields
+for _, name in pairs{
     "hawt-turbine-mk01",
     "hawt-turbine-mk02",
     "hawt-turbine-mk03",
     "hawt-turbine-mk04",
+    "hawt-turbine-mk01-blank",
+    "hawt-turbine-mk02-blank",
+    "hawt-turbine-mk03-blank",
+    "hawt-turbine-mk04-blank",
     "vawt-turbine-mk01",
     "vawt-turbine-mk02",
     "vawt-turbine-mk03",
     "vawt-turbine-mk04",
     "multiblade-turbine-mk01",
     "multiblade-turbine-mk03",
-    "solar-panel-mk02",
-    "solar-panel-mk03",
-}
-
-for _, name in pairs(electric_energy_interfaces) do
-    local item = data.raw.item[name]
-    local entity = data.raw["electric-energy-interface"][name]
-    local output = {"entity-description.max-output", tostring(entity.energy_production)}
-    if item.localised_description then
-        item.localised_description = {"", item.localised_description, "\n", (output)}
-    elseif entity.localised_description then
-        item.localised_description = {"", entity.localised_description, "\n", output}
-    else
-        item.localised_description = {"?", {"", {"entity-description." .. name}, "\n", output}, output}
-    end
-    entity.energy_source.buffer_capacity = entity.energy_production
+    "multiblade-turbine-mk01-blank",
+    "multiblade-turbine-mk03-blank",
+} do
+    local entity = data.raw["solar-panel"][name]
+    entity.custom_tooltip_fields = entity.custom_tooltip_fields or {}
+    entity.custom_tooltip_fields[#entity.custom_tooltip_fields+1] = {
+        name = {"entity-description.output-per-kmph"},
+        value = entity.production
+    }
 end
 
 local molten_salt_recipes = {

data-updates.lua

@@ -301,9 +301,13 @@ require "prototypes.animations.hawt-turbine-mk01"
 require "prototypes.animations.hawt-turbine-mk02"
 require "prototypes.animations.hawt-turbine-mk03"
 require "prototypes.animations.hawt-turbine-mk04"
+require "prototypes.animations.tidal"
 
 require "prototypes.decay.decay"
 
+--(( OTHER ))
+require "prototypes.surface-properties"
+
 data.raw.fluid["crude-oil"].subgroup = "test"
 data.raw.fluid["gasoline"].subgroup = "test"
 data.raw.fluid["fatty-acids"].fuel_value = "1MJ"

data.lua

@@ -1,21 +1,20 @@
 {
     "name": "pyalternativeenergy",
-    "version": "3.1.38",
-    "factorio_version": "2.0",
+    "version": "3.2.0",
+    "factorio_version": "2.1",
     "title": "Pyanodons Alternative Energy",
-    "author": "Pyanodon, Nexela, Kingarthur, Notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple, Przemo",
+    "author": "Pyanodon, Nexela, Kingarthur, Notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple, przemo1232, protocol_1903",
     "contact": "https://discord.gg/SBHM3h5Utj",
     "homepage": "https://github.com/pyanodon/pyalternativeenergy",
     "description": "Contains POWER!",
     "dependencies": [
-        "base >= 2.0.48",
-        "pyalienlife >= 3.0.63",
-        "pyhightech >= 3.0.15",
-        "~ pyalternativeenergygraphics >= 3.0.4",
-        "? enable-all-feature-flags",
+        "base >= 2.1.0",
+        "pyalienlife >= 3.1.0",
+        "pyhightech >= 3.1.0",
+        "~ pyalternativeenergygraphics >= 3.1.0",
+        "+ enable-all-feature-flags",
         "(?) pyindustry",
         "! wret-beacon-rebalance-mod",
-        "! BigBags",
         "! ResearchFog",
         "! omnimatter_energy"
     ],

info.json

@@ -173,10 +173,10 @@ nuclear-reactor-mox-mk01=Spaltet Atome seit der antiken Erde.
 nuclear-reactor-mox-mk02=Spaltet Atome seit der antiken Erde.
 nuclear-reactor-mox-mk03=Spaltet Atome seit der antiken Erde.
 nuclear-reactor-mox-mk04=Spaltet Atome seit der antiken Erde.
-tidal-mk01=Gewinnt Energie aus den Gezeiten. Muss am Ufer plaziert weden.\n[font=default-semibold][color=255,230,192]Leistung: [/color][/font]6.0 MW
-tidal-mk02=Gewinnt Energie aus den Gezeiten. Muss am Ufer plaziert weden.\n[font=default-semibold][color=255,230,192]Leistung: [/color][/font]40.0 MW
-tidal-mk03=Gewinnt Energie aus den Gezeiten. Muss am Ufer plaziert weden.\n[font=default-semibold][color=255,230,192]Leistung: [/color][/font]90.0 MW
-tidal-mk04=Gewinnt Energie aus den Gezeiten. Muss am Ufer plaziert weden.\n[font=default-semibold][color=255,230,192]Leistung: [/color][/font]400.0 MW
+tidal-mk01=Gewinnt Energie aus den Gezeiten. Muss am Ufer plaziert weden.
+tidal-mk02=Gewinnt Energie aus den Gezeiten. Muss am Ufer plaziert weden.
+tidal-mk03=Gewinnt Energie aus den Gezeiten. Muss am Ufer plaziert weden.
+tidal-mk04=Gewinnt Energie aus den Gezeiten. Muss am Ufer plaziert weden.
 numal-reef-mk01=Ein künstliches Riff für außerirdische Tintenfische. Muss im Wasser plaziert werden.
 numal-reef-mk02=Ein künstliches Riff für außerirdische Tintenfische. Muss im Wasser plaziert werden.
 numal-reef-mk03=Ein künstliches Riff für außerirdische Tintenfische. Muss im Wasser plaziert werden.

locale/de/entity.cfg

@@ -44,7 +44,3 @@ lifetime-generation=[font=default-semibold][color=255,230,192]Insgesamte jemals
 airspace-traffic-flow=[font=default-semibold][color=255,230,192]Luftraumverkehrsfluss: [/color][/font]__1__%
 eta=[font=default-semibold][color=255,230,192]Δt zur Ankunft: [/color][/font]__1__:__2__
 stranded=Eine Luftturbine [item=__1__] ist gestrandet @ [gps=__2__,__3__]
-
-[entity-status]
-requires-moonlight=Benötigt Mondlicht
-requires-sunlight=Benötigt Sonnenlicht

locale/de/extra.cfg

@@ -171,10 +171,10 @@ nuclear-reactor-mox-mk01=Splitting atoms since old Earth.
 nuclear-reactor-mox-mk02=Splitting atoms since old Earth.
 nuclear-reactor-mox-mk03=Splitting atoms since old Earth.
 nuclear-reactor-mox-mk04=Splitting atoms since old Earth.
-tidal-mk01=Extracts energy from the tides. Must be placed on a shoreline.\n[font=default-semibold][color=255,230,192]Output: [/color][/font]6.0 MW
-tidal-mk02=Extracts energy from the tides. Must be placed on a shoreline.\n[font=default-semibold][color=255,230,192]Output: [/color][/font]40.0 MW
-tidal-mk03=Extracts energy from the tides. Must be placed on a shoreline.\n[font=default-semibold][color=255,230,192]Output: [/color][/font]90.0 MW
-tidal-mk04=Extracts energy from the tides. Must be placed on a shoreline.\n[font=default-semibold][color=255,230,192]Output: [/color][/font]400.0 MW
+tidal-mk01=Extracts energy from the tides. Must be placed on a shoreline.
+tidal-mk02=Extracts energy from the tides. Must be placed on a shoreline.
+tidal-mk03=Extracts energy from the tides. Must be placed on a shoreline.
+tidal-mk04=Extracts energy from the tides. Must be placed on a shoreline.
 numal-reef-mk01=An artificial reef for alien squids on shore. Must be placed underwater.
 numal-reef-mk02=An artificial reef for alien squids on shore. Must be placed underwater.
 numal-reef-mk03=An artificial reef for alien squids on shore. Must be placed underwater.

locale/en/entity.cfg

@@ -43,6 +43,14 @@ airspace-traffic-flow=[font=default-semibold][color=255,230,192]Airspace traffic
 eta=[font=default-semibold][color=255,230,192]Δt of arrival: [/color][/font]__1__:__2__
 stranded=An aerial turbine [item=__1__] was stranded @ [gps=__2__,__3__]
 
-[entity-status]
-requires-moonlight=Requires moonlight
-requires-sunlight=Requires sunlight
+[surface-property-name]
+py-wind-speed-min=Minimum wind speed
+py-wind-speed-max=Maximum wind speed
+py-tide-height-min=Minimum tide height
+py-tide-height-max=Maximum tide height
+
+[surface-property-unit]
+py-wind-speed-min=__1__ kmph
+py-wind-speed-max=__1__ kmph
+py-tide-height-min=__1__ m
+py-tide-height-max=__1__ m