Merge branch 'Frozen' into main

.github/workflows/factoriotest-pr.yml

@@ -12,8 +12,9 @@ permissions:
 jobs:
   test-pull-request:
     name: PR
-    uses: pyanodon/pyanodontests/.github/workflows/pytest.yml@v1
+    uses: pyanodon/pyanodontests/.github/workflows/pytest.yml@v1.5.0
     with:
       repository: ${{ github.repository }}
       ref: ${{ github.event.pull_request.head.sha }}
+      test_branch: ${{ github.head_ref || github.ref_name }}
     secrets: inherit

.github/workflows/factoriotest-push.yml

@@ -12,8 +12,9 @@ permissions:
 jobs:
   test-push:
     name: Push
-    uses: pyanodon/pyanodontests/.github/workflows/pytest.yml@v1
+    uses: pyanodon/pyanodontests/.github/workflows/pytest.yml@v1.5.0
     with:
       repository: ${{ github.repository }}
       ref: ${{ github.sha }}
+      test_branch: ${{ github.head_ref || github.ref_name }}
     secrets: inherit

changelog.txt

@@ -1,4 +1,59 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.2.45
+Date: in 5 hours
+  Changes:
+    - fixed some recipes outputting more steam than input water when using productivity modules
+---------------------------------------------------------------------------------------------------
+Version: 1.2.44
+Date: 2024-9-4
+  Fission:
+    - Closed the uf6 temperature gap in processing recipes
+---------------------------------------------------------------------------------------------------
+Version: 1.2.43
+Date: 2024-8-26
+  Fusion:
+    - moved mdh power output priority down from solar tier to normal
+    - changed the fluid inputs on deuterium tritium fusion to have 2 water ports instead of deuterium
+---------------------------------------------------------------------------------------------------
+Version: 1.2.42
+Date: 2024-8-26
+  Fusion:
+    - Changed fusion reactor building recipes and fusion reaction recipes
+    - reaction recipes no longer contain building parts
+    - changed deuterium production process to make it longer and stronger
+    - removed antimatter fusion recipe as it didnt fit to reworked fusion reactor recipes. will return in pysex
+    - adjusted mdh generator consumption per tick from 50->400 and lowered max fluid temp to match the max output of the fusion reactors
+    - adjusted used control rod tritium output from 100 -> 5
+    - changed liquid helium recipe crafting time from 10s to 5s, changed helium input from 20 -> 100 and changed the output from 2 -> 10
+    - added hydrogen sulfide, deuterium sulfide and enriched water fluids
+    - moved time crystal recipe from fusion reactor to particle accelerator
+---------------------------------------------------------------------------------------------------
+Version: 1.2.41
+Date: 2024-8-8
+  Bugfixes:
+    - Nuclear fuel now correctly burns to spent nuclear fuel
+    - Fix tiles being attributed to the wrong solar updraft tower
+    - Fix that minging productivity infinite research didnt correctly increase in costs per level
+---------------------------------------------------------------------------------------------------
+Version: 1.2.40
+Date: 2024-7-29
+  Bugfixes:
+    - Fixed stutter on clicking electric poles
+    - Added mining productivity 4-12 and shifted current mining prod techs to be earlier in the tech tree locked behind mining machines tech
+---------------------------------------------------------------------------------------------------
+Version: 1.2.39
+Date: 2024-7-13
+  Bugfixes:
+    - Fixed that 1.2.38 changelog was labeled as 1.2.37 as that version got microsofted
+    - Fixed iron processing mk02 tech required a number of unneeded prereqs due to the hydrocyclone being in vanadium processing
+    - Moved hydrocyclone to iron processing mk02
+---------------------------------------------------------------------------------------------------
+Version: 1.2.38
+Date: 2024-7-7
+  Bugfixes:
+    - Fixed a rare corruption in aerial data structures
+    - added nuclear fuel to assembling machine 3, atomizer 3/4, sinter plant, and burner
+---------------------------------------------------------------------------------------------------
 Version: 1.2.36
 Date: 2024-6-27
   Bugfixes:

data.lua

@@ -154,6 +154,8 @@ require 'prototypes.fluids.antimony-phosphate'
 require 'prototypes.fluids.hydrofluoric-acid'
 require 'prototypes.fluids.molten-fluoride'
 require 'prototypes.fluids.fluorine-gas'
+require 'prototypes.fluids.hydrogen-sulfide'
+require 'prototypes.fluids.enriched-water'
 
 -- ))
 

info.json

@@ -1,6 +1,6 @@
 {
   "name": "pyalternativeenergy",
-  "version": "1.2.36",
+  "version": "1.2.44",
   "factorio_version": "1.1",
   "title": "Pyanodons Alternative Energy",
   "author": "Pyanodon, Nexela, Kingarthur, Notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple, Przemo",

locale/en/fluid.cfg

@@ -109,3 +109,8 @@ sb-phosphate-2=Antimony phosphate 2
 sb-phosphate-3=Antimony phosphate 3
 
 void=Void
+
+enriched-water=Enriched water
+deuterium-sulfide=Deuterium sulfide
+hydrogen-sulfide=Hydrogen sulfide
+

locale/en/item.cfg

@@ -328,6 +328,7 @@ mechanical-parts-03=Mechanical Parts 03
 mechanical-parts-04=Mechanical Parts 04
 quantum-battery=Quantum battery
 nuclear-artillery-shell=Fat Man
+used-nuclear-fuel=Spent nuclear fuel
 
 [item-description]
 vitrified-glass=High-level radioactive waste storage. This waste product is extremely difficult to remove and must be launched into space.

locale/ru/fluid.cfg

@@ -100,3 +100,6 @@ sb-phosphate-1=Фосфат сурьмы 1
 sb-phosphate-2=Фосфат сурьмы 2
 sb-phosphate-3=Фосфат сурьмы 3
 void=Пустота
+enriched-water=Обогащённая вода
+deuterium-sulfide=Сульфид дейтерия
+hydrogen-sulfide=Сероводород

migrations/aerial-1.2.37.lua

@@ -0,0 +1,19 @@
+--[[
+ Fix case where we accidentally placed accumulators in the table without specifying their network
+--]]
+if global.aerials and global.aerials.accumulators then
+    for network_id, table_entry in pairs(global.aerials.accumulators) do
+        if table_entry.type then
+            global.aerials.accumulators[network_id] = nil
+            if table_entry.valid and table_entry.electric_network_id then
+                log('found an oopsie')
+                -- Migrate to the correct place in the structure if possible
+                if global.aerials.accumulators[table_entry.electric_network_id][table_entry.name] then
+                    table_entry.destroy()
+                else
+                    global.aerials.accumulators[table_entry.electric_network_id][table_entry.name] = table_entry
+                end
+            end
+        end
+    end
+end

prototypes/buildings/mdh.lua

@@ -41,8 +41,8 @@ ENTITY {
     max_health = 300,
     corpse = "big-remnants",
     effectivity = 1,
-    fluid_usage_per_tick = 50,
-    maximum_temperature = 5000,
+    fluid_usage_per_tick = 400,
+    maximum_temperature = 4000,
     destroy_non_fuel_fluid = false,
     resistances = {
         {

prototypes/fluids/enriched-water.lua

@@ -0,0 +1,16 @@
+
+FLUID {
+    type = "fluid",
+    name = "enriched-water",
+    icon = "__pyalternativeenergygraphics__/graphics/icons/enriched-water.png",
+	icon_size = 32,
+    default_temperature = 10,
+    base_color = {r = 255, g = 69, b = 0},
+    flow_color = {r = 1, g = 1, b = 1},
+    max_temperature = 100,
+    gas_temperature = 15,
+    pressure_to_speed_ratio = 0.4,
+    flow_to_energy_ratio = 0.59,
+    subgroup = "py-fusion-fluids",
+    order = "c"
+}

prototypes/fluids/hydrogen-sulfide.lua

@@ -0,0 +1,32 @@
+
+FLUID {
+    type = "fluid",
+    name = "hydrogen-sulfide",
+    icon = "__pyalternativeenergygraphics__/graphics/icons/hydrogen-sulfide.png",
+	icon_size = 64,
+    default_temperature = 10, -- less than 15 = liquid / equal a 15 = gas
+    base_color = {r = 0.431, g = 0.556, b = 0.627},
+    flow_color = {r = 1, g = 1, b = 1},
+    max_temperature = 100,
+    gas_temperature = 15,
+    pressure_to_speed_ratio = 0.4,
+    flow_to_energy_ratio = 0.59,
+    subgroup = "py-alternativeenergy-fluids",
+    order = "c"
+}
+
+FLUID {
+    type = "fluid",
+    name = "deuterium-sulfide",
+    icon = "__pyalternativeenergygraphics__/graphics/icons/deuterium-sulfide.png",
+	icon_size = 64,
+    default_temperature = 10, -- less than 15 = liquid / equal a 15 = gas
+    base_color = {r = 0.431, g = 0.556, b = 0.627},
+    flow_color = {r = 1, g = 1, b = 1},
+    max_temperature = 100,
+    gas_temperature = 15,
+    pressure_to_speed_ratio = 0.4,
+    flow_to_energy_ratio = 0.59,
+    subgroup = "py-alternativeenergy-fluids",
+    order = "c"
+}

prototypes/recipes/recipes-eva.lua

@@ -11,7 +11,7 @@ RECIPE {
     },
     results = {
         {type = "fluid", name = "middle-processed-lard", amount = 20},
-        {type = "fluid", name = "steam", amount = 500, temperature = 150},
+        {type = "fluid", name = "steam", amount = 500, temperature = 150, catalyst_amount = 500},
         {type = "fluid", name = "tar", amount = 50},
     },
     main_product = "middle-processed-lard",

prototypes/recipes/recipes-intermetallics.lua

@@ -458,9 +458,9 @@ RECIPE {
 RECIPE {
     type = "recipe",
     name = "time-crystal",
-    category = "fusion-01",
+    category = "pa",
     enabled = false,
-    energy_required = 20,
+    energy_required = 60,
     ingredients = {
         {type = "item", name = "diamond", amount = 5},
         {type = "item", name = "parametric-oscilator", amount = 1}, -- nv-center

prototypes/recipes/recipes-nuclear-uranium.lua

@@ -129,7 +129,7 @@ RECIPE {
         {type = 'fluid', name = 'hot-molten-salt', amount = 50},
     },
     results = {
-        {type = 'fluid', name = 'tritium', amount = 100},
+        {type = 'fluid', name = 'tritium', amount = 5},
         {type = 'item', name = 'control-rod', amount = 1, probability = 0.5},
         {type = 'fluid', name = 'molten-salt', amount = 50},
     },