Merge pull request #47 from pyanodon/Frozen

Frozen

changelog.txt

@@ -1,8 +1,14 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.2.20
+Date: 2024-3-13
+  Changes:
+    - Added compatibility with Jetpacks mod
+---------------------------------------------------------------------------------------------------
 Version: 0.2.19
-Date: ???
+Date: 2024-2-28
   Changes:
     - Fix crash with pyCP is missing
+    - Fix compatibility with Renai Transportation affecting exoskeleton recipe
 ---------------------------------------------------------------------------------------------------
 Version: 0.2.18
 Date: 2024-1-20

data-final-fixes.lua

@@ -6,11 +6,6 @@ require('__stdlib__/stdlib/data/data').Util.create_data_globals()
 local table = require('__stdlib__/stdlib/utils/table')
 local config = require 'prototypes.config'
 
-----------------------------------------------------
--- THIRD PARTY COMPATIBILITY
-----------------------------------------------------
-require('prototypes/functions/compatibility')
-
 for _, module in pairs(data.raw.module) do
     local remove_recipe = {}
 
@@ -273,6 +268,11 @@ else
     require 'cached-configs.run'
 end
 
+----------------------------------------------------
+-- THIRD PARTY COMPATIBILITY
+----------------------------------------------------
+require('prototypes/functions/compatibility')
+
 ----------------------------------------------------
 -- TECHNOLOGY CHANGES
 ----------------------------------------------------

info.json

@@ -1,6 +1,6 @@
 {
   "name": "pypostprocessing",
-  "version": "0.2.18",
+  "version": "0.2.20",
   "factorio_version": "1.1",
   "title": "Pyanodons Post-processing",
   "author": "Pyanodon, Shadowglass",
@@ -30,7 +30,8 @@
     "? deadlock_stacked_recipes",
     "? DeadlocksStackingForPyanadon",
     "? LightedPolesPlus",
-    "! ResearchFog"
+    "! ResearchFog",
+    "? jetpack"
   ],
   "package": {
     "ignore": [],

prototypes/functions/compatibility.lua

@@ -566,12 +566,28 @@ if mods['RenaiTransportation'] then
         RECIPE('RTZiplineRecipe4'):add_ingredient({type = 'item', name = 'mechanical-parts-03', amount = 10})
         RECIPE('RTTrainRampRecipe'):add_ingredient({type = 'item', name = 'intermetallics', amount = 10})
 
-        data.raw.recipe['RTZiplineRecipe5'].ingredients = data.raw.recipe['exoskeleton-equipment'].ingredients
+        data.raw.recipe['RTZiplineRecipe5'].ingredients = table.deepcopy(data.raw.recipe['exoskeleton-equipment'].ingredients)
 
         RECIPE('RTZiplineRecipe5'):add_ingredient({type = 'item', name = 'fusion-reactor-equipment', amount = 1}):add_ingredient({type = 'item', name = 'RTZiplineItem4', amount = 1}):add_ingredient({type = 'item', name = 'nuclear-fuel', amount = 5})
     end
 end
 
 if mods['angelsrefining'] and not mods['PyCoalTBaA'] then
     error('\n\n\n\n\nPlease install PyCoal Touched By an Angel\n\n\n\n\n') 
+end
+
+if mods['jetpack'] and mods['pyrawores'] and mods['pypetroleumhandling'] then
+    -- using remove_pack doesn't work, I don't understand why
+    local rocket_fuel = data.raw.technology["rocket-fuel"]
+    rocket_fuel.prerequisites = mods['pyalienlife'] and { "py-science-pack-mk01", "scrude", "electrolysis"} or {"scrude", "electrolysis"}
+    rocket_fuel.unit = {
+        ingredients = {{ mods['pyalienlife'] and "py-science-pack-1" or "automation-science-pack", 1 }},
+        count = 100,
+        time = 30
+    }
+    TECHNOLOGY("jetpack-1"):set_fields{prerequisites = {"rocket-fuel"}}:remove_pack("chemical-science-pack"):remove_pack("logistic-science-pack"):add_pack("py-science-pack-1")
+    RECIPE("jetpack-1"):add_ingredient({type = 'item', name = 'mechanical-parts-01', amount = 2}):replace_ingredient("electronic-circuit", "electronics-mk01")
+    TECHNOLOGY("jetpack-2"):set_fields{prerequisites = {"jetpack-1"}}:remove_pack("chemical-science-pack"):add_pack("py-science-pack-2"):add_prereq(mods['pyalienlife'] and 'py-science-pack-mk02' or 'logistic-science-pack')
+    TECHNOLOGY("jetpack-3"):set_fields{prerequisites = {"jetpack-2"}}:remove_pack("production-science-pack"):remove_pack("py-science-pack-4"):remove_pack("utility-science-pack"):add_pack("py-science-pack-3"):add_prereq(mods['pyalienlife'] and 'py-science-pack-mk03' or 'chemical-science-pack')
+    TECHNOLOGY("jetpack-4"):set_fields{prerequisites = {"jetpack-3"}}:remove_pack("space-science-pack"):add_prereq('utility-science-pack')
 end