k2 updates

changelog.txt

@@ -3,6 +3,8 @@ Version: 2.0.23
 Date: 2025-05-03
   Fixes:
     - Fix load issue with Bob's
+  Changes:
+    - K2: Updated compatibility (with thanks to autechr3 and pla)
 ---------------------------------------------------------------------------------------------------
 Version: 2.0.22
 Date: 2025-03-10

data-util.lua

@@ -115,12 +115,9 @@ function util.fe_plus(sub)
   end
 end
 
-function util.get_stack_size(default) 
+function util.get_stack_size(default)
-  if mods.Krastorio2 then
+  if mods.Krastorio2 and kr_adjust_stack_sizes then
-    local size = get_setting("kr-stack-size")
+    return tonumber(200)
-    if size and tonumber(size) then
-      return tonumber(size)
-    end
   end
   return default
 end
@@ -515,14 +512,11 @@ end
 -- k2 matter 
 -- params: {k2matter}, k2baseicon , {icon}
 function util.k2matter(params)
-  local matter = require("__Krastorio2__/lib/public/data-stages/matter-util")
+  local matter = require("__Krastorio2__/prototypes/libraries/matter")
   if mods["space-exploration"] then 
-    params.k2matter.need_stabilizer = true
+    params.k2matter.needs_stabilizer = true
   end
-  if not params.k2matter.minimum_conversion_quantity then
+  if not data.raw.technology[params.k2matter.unlocked_by] then
-    params.k2matter.minimum_conversion_quantity = 10
-  end
-  if not data.raw.technology[params.k2matter.unlocked_by_technology] then
     local icon = ""
     if params.k2baseicon then
       icon = util.k2assets().."/technologies/matter-"..params.k2baseicon..".png"
@@ -534,7 +528,7 @@ function util.k2matter(params)
         {
           {
             type = "technology",
-            name = params.k2matter.unlocked_by_technology,
+            name = params.k2matter.unlocked_by,
             icons =
             {
               {
@@ -561,15 +555,20 @@ function util.k2matter(params)
               {
                 {"production-science-pack", 1},
                 {"utility-science-pack", 1},
-                {"matter-tech-card", 1}
+                {"kr-matter-tech-card", 1}
               },
               time = 45,
             },
+            effects = {}
             -- (ignore for now) localised_name = {"technology-name.k2-conversion", {"item-name."..params.k2matter.item_name}},
           },
         })
   end
-  matter.createMatterRecipe(params.k2matter)
+  if params.k2matter.only_deconversion then
+    matter.make_deconversion_recipe(params.k2matter)
+  else
+    matter.make_recipes(params.k2matter)
+  end
 end
 
 

titanium-enriched.lua

@@ -34,14 +34,14 @@ data:extend(
 	subgroup = "raw-material",
     ingredients =
     {
-      {type = "fluid", name = "hydrogen-chloride", amount = 10},
+      {type = "fluid", name = "kr-hydrogen-chloride", amount = 10},
-      {type = "fluid", name = "water", amount = 25, catalyst_amount = 25},
+      {type = "fluid", name = "water", amount = 25, ignored_by_stats=25, ignored_by_productivity=25},
       {type = "item",  name = "titanium-ore", amount = 9}
     },
     results =
     { 
       {type = "item",  name = "enriched-titanium", amount = 6},
-      {type = "fluid", name = "dirty-water", amount = 25, catalyst_amount = 25}
+      {type = "fluid", name = "kr-dirty-water", amount = 25, ignored_by_stats=25, ignored_by_productivity=25}
     },
     crafting_machine_tint =
     {
@@ -68,10 +68,9 @@ data:extend(
       allow_productivity = true,
       ingredients = 
       {
-        {"enriched-titanium", 10}
+        util.item("enriched-titanium", 10),
       },
-      result = util.me.titanium_plate,
+      results = {util.item(util.me.titanium_plate, 5)},
-      result_count = 5,
       order = "b[titanium-plate]-b[enriched-titanium-plate]"
   },	
   {
@@ -122,21 +121,21 @@ data:extend(
 	{
 		type = "recipe",
 		name = "dirty-water-filtration-titanium",
-		category = "fluid-filtration",
+		category = "kr-fluid-filtration",
 		icons =
 		{
 			{
-				icon = data.raw.fluid["dirty-water"].icon,
+				icon = data.raw.fluid["kr-dirty-water"].icon,
-				icon_size = data.raw.fluid["dirty-water"].icon_size
+				icon_size = data.raw.fluid["kr-dirty-water"].icon_size
 			},
 			{
 				icon = data.raw.item["titanium-ore"].icon,
 				icon_size =	data.raw.item["titanium-ore"].icon_size,
-				scale = 0.20 * (data.raw.fluid["dirty-water"].icon_size/data.raw.item["titanium-ore"].icon_size),
+				scale = 0.20 * 64 / (data.raw.item["titanium-ore"].icon_size or 64),
 				shift = {0, 4}
 			}
 		},
-		icon_size = data.raw.fluid["dirty-water"].icon_size,
+		icon_size = data.raw.fluid["kr-dirty-water"].icon_size,
 		energy_required = 2,
 		enabled = false,
 		allow_as_intermediate = false,
@@ -144,11 +143,11 @@ data:extend(
 		always_show_products = true,
 		ingredients =
 		{
-			{type = "fluid", name = "dirty-water", amount = 100, catalyst_amount = 100},
+			{type = "fluid", name = "kr-dirty-water", amount = 100, ignored_by_stats=100, ignored_by_productivity=100},
 		},
 		results =
 		{
-			{type = "fluid", name = "water", amount = 90, catalyst_amount = 90},
+			{type = "fluid", name = "water", amount = 90, ignored_by_stats=90, ignored_by_productivity=90},
 			{type = "item",  name = "stone", probability = 0.30, amount = 1},
 			{type = "item",  name = "titanium-ore", probability = 0.05, amount = 1}
 		},

titanium-matter.lua

@@ -1,7 +1,6 @@
 -- Matter recipes for Krastorio2
 if mods["Krastorio2"] then
 local util = require("__bztitanium__.data-util");
-local matter = require("__Krastorio2__/lib/public/data-stages/matter-util")
 
 data:extend(
 {
@@ -20,6 +19,7 @@ data:extend(
         scale = 1.5,
       }
     },
+    effects = {},
     prerequisites = {"kr-matter-processing"},
     unit =
   	{
@@ -28,35 +28,42 @@ data:extend(
       {
         {"production-science-pack", 1},
         {"utility-science-pack", 1},
-        {"matter-tech-card", 1}
+        {"kr-matter-tech-card", 1}
       },
       time = 45
     }
   },
 })
 
-local titanium_ore_matter = 
+util.k2matter({
-	{
+	k2matter = {
-    item_name = "titanium-ore",
+    material = {
-    minimum_conversion_quantity = 10,
+      name = "titanium-ore",
-    matter_value = 8,
+      type = "item",
+      amount = 10,
+    },
+    matter_count = 8,
     energy_required = 1,
-    need_stabilizer = false,
+    needs_stabilizer = false,
-    unlocked_by_technology = "titanium-matter-processing"
+    allow_productivity = true,
+    unlocked_by = "titanium-matter-processing"
 	}
-matter.createMatterRecipe(titanium_ore_matter)
+})
 
-
+util.k2matter({
-local titanium_plate_matter = 
+	k2matter = {
-	{
+    material = {
-    item_name = util.me.titanium_plate,
+      name = "titanium-plate",
-    minimum_conversion_quantity = 10,
+      type = "item",
-    matter_value = 14,
+      amount = 10,
+    },
+    matter_count = 14,
     energy_required = 2,
+    needs_stabilizer = true,
+    allow_productivity = true,
     only_deconversion = true,
-    need_stabilizer = true,
+    unlocked_by = "titanium-matter-processing"
-    unlocked_by_technology = "titanium-matter-processing"
 	}
-matter.createMatterRecipe(titanium_plate_matter)
+})
 
 end