Merge branch 'master' into master

changelog.txt

@@ -6,6 +6,21 @@ Date: 2021-03-08
     - New mod icon
     - Added mipmaps to icons
 ---------------------------------------------------------------------------------------------------
+Version: 0.9.17
+Date: 2021-03-06
+  Features:
+    - The Big Furnace recipe
+---------------------------------------------------------------------------------------------------
+Version: 0.9.16
+Date: 2021-02-12
+  Fixes:
+    - Another tiny py compatibility tweak.
+---------------------------------------------------------------------------------------------------
+Version: 0.9.15
+Date: 2021-01-29
+  Fixes:
+    - K2 stack size fix for no changes
+---------------------------------------------------------------------------------------------------
 Version: 0.9.14
 Date: 2021-01-25
   Changes:

data-util.lua

@@ -16,11 +16,16 @@ else
 end
 
 
-function data_util.get_k2_stack_size() 
+function data_util.get_stack_size(default) 
-  return tonumber(krastorio.general.getSafeSettingValue("kr-stack-size"))
+  if mods["Krastorio2"] then
+    size = tonumber(krastorio.general.getSafeSettingValue("kr-stack-size"))
+    return size or default
+  end
+  return default
 end
 
 
+
 -- Remove an element of type t and name from data.raw
 function data_util.remove_raw(t, name)
   for i, elem in pairs(data.raw[t]) do

info.json

@@ -1,24 +1,24 @@
-{
+{
-    "name": "bztitanium",
+    "name": "bztitanium",
-    "version": "0.10.0",
+    "version": "0.10.0",
-    "factorio_version": "1.1",
+    "factorio_version": "1.1",
-    "title": "Titanium",
+    "title": "Titanium",
-    "author": "Brevven",
+    "author": "Brevven",
-    "contact": "",
+    "contact": "",
-    "homepage": "",
+    "homepage": "",
-    "dependencies": [
+    "dependencies": [
-      "base >= 1.0.0",
+      "base >= 1.0.0",
-      "? aai-industry",
+      "? aai-industry",
-      "? space-exploration",
+      "? space-exploration",
-      "? Krastorio2",
+      "? Krastorio2",
-      "? Rich-Rocks-Requiem",
+      "? Rich-Rocks-Requiem",
-      "? FactorioExtended-Plus-Core",
+      "? FactorioExtended-Plus-Core",
-      "? Pre0-17-60Oil",
+      "? Pre0-17-60Oil",
-      "? Deadlock-SE-bridge",
+      "? Deadlock-SE-bridge",
-      "? deadlock-beltboxes-loaders",
+      "? deadlock-beltboxes-loaders",
-      "? DeadlockCrating",
+      "? DeadlockCrating",
-      "? modmashsplinterresources"
+      "? modmashsplinterresources"
-    ],
+    ],
-    "description": "Adds titanium to the base game.\n\nTitanium is used in Low Density Structures, Flying Robot Frames and a few other places.\n\nCompatible with Krastorio 2, Space Exploration, Aircraft, 5Dim's, FE+ and other mods."
+    "description": "Adds titanium to the base game.\n\nTitanium is used in Low Density Structures, Flying Robot Frames and a few other places.\n\nCompatible with Krastorio 2, Space Exploration, Aircraft, 5Dim's, FE+ and other mods."
-}
+}
-
+

titanium-enriched.lua

@@ -17,7 +17,7 @@ data:extend(
       },
     subgroup = "raw-material",
     order = "e05-a[enriched-ores]-a1[enriched-titanium]",
-    stack_size = util.get_k2_stack_size(),
+    stack_size = util.get_stack_size(100),
   },
   {
     type = "recipe",

titanium-ore.lua

@@ -6,6 +6,7 @@ if mods["FactorioExtended-Plus-Core"] then
   util.remove_raw("item", "titanium-ore")
 end
 
+if (not mods["pyrawores"]) then
 data:extend({
 	{
     type = "autoplace-control",
@@ -81,7 +82,8 @@ data:extend({
       },
       subgroup = "raw-resource",
       order = "t-c-a",
-      stack_size = (mods["Krastorio2"] and util.get_k2_stack_size() or 50)
+      stack_size = util.get_stack_size(50)
   },
 })
+end
 

titanium-recipe-se.lua

@@ -27,7 +27,6 @@ if mods["space-exploration"] then
         { icon = "__bztitanium__/graphics/icons/titanium-plate.png", icon_size = 64, icon_mipmaps = 3 },
         { icon = "__space-exploration-graphics__/graphics/icons/vulcanite-block.png", icon_size = 64, scale=0.25, shift= {-10, -10}},
       },
-      
     },
     })
     table.insert(data.raw.technology["se-processing-vulcanite"].effects, 

titanium-recipe.lua

@@ -59,7 +59,7 @@ data:extend(
     icon_size = 64, icon_mipmaps = 3,
     subgroup = "raw-material",
     order = "b[titanium-plate]",
-    stack_size = (mods["Krastorio2"] and util.get_k2_stack_size() or 100)
+    stack_size = util.get_stack_size(100)
   },
   {
     type = "technology",
@@ -71,7 +71,11 @@ data:extend(
       {
         type = "unlock-recipe",
         recipe = util.titanium_plate
-      }
+      },
+      mods["TheBigFurnace"] and {
+        type = "unlock-recipe",
+        recipe = "big-titanium-plate",
+      } or nil,
     },
     unit =
     {
@@ -91,6 +95,28 @@ data:extend(
     prerequisites = {"lubricant"},
     order = "b-b"
   },
+  mods["TheBigFurnace"] and {
+    type = "recipe",
+    name = "big-titanium-plate",
+    category = "big-smelting",
+    order = "d[titanium-plate]",
+    normal =
+    {
+      enabled = false,
+      energy_required = 8.75,
+      ingredients = {{"titanium-ore", 50}},
+      result = util.titanium_plate,
+      result_count = 10,
+    },
+    expensive =
+    {
+      enabled = false,
+      energy_required = 16,
+      ingredients = {{"titanium-ore", 100}},
+      result = util.titanium_plate,
+      result_count = 10,
+    }
+  } or nil,
 }
 )
 end