carbon-fiber

carbon-fiber.lua

@@ -1,6 +1,36 @@
-local util = require("__bzcarbon__.data-util");
+local util = require("data-util");
 
 if util.me.use_fiber() then
+data:extend({
+  {
+    type = "item",
+    name = "polyacrylonitrile",
+    icon = "__bzcarbon__/graphics/icons/pan.png",
+    icon_size = 128,
+    subgroup = "intermediate-product",
+    order = "g[graphite-acrylic-fiber]",
+    stack_size = util.get_stack_size(100),
+  },
+  {
+    type = "recipe",
+    name = "polyacrylonitrile",
+    category = "chemistry",
+    order = "d[graphite-carbon-fiber]",
+    enabled = false,
+    energy_required = 1,
+    ingredients = data.raw.fluid["ammonia"] and
+    {
+      {type="fluid", name="petroleum-gas", amount=5},
+      {type="fluid", name="ammonia", amount=5},
+    } or {
+      {type="fluid", name="petroleum-gas", amount=10},
+    },
+    results = {
+      {type="item", name= "polyacrylonitrile", amount=1},
+    },
+  },
+})
+
 data:extend({
   {
     type = "item",
@@ -17,14 +47,44 @@ data:extend({
     category = "advanced-crafting",
     order = "d[graphite-carbon-fiber]",
     enabled = false,
-    energy_required = 1,
+    energy_required = 24,
     ingredients = {
-      {type="item", name="plastic", amount=1},
-      {type="item", name="graphite", amount=1},
+      {type="fluid", name="epoxy", amount = 20},
+      {"plastic-bar", 2},
+      {"polyacrylonitrile", 4},
     },
     results = {
-      {type="item", name= "carbon-fiber", amount=1},
-    }
+      {type="item", name= "carbon-fiber", amount=8},
+    },
   },
 })
+util.replace_some_ingredient("carbon-fiber", "plastic", 1, "silica", 2, {force=true})
+data:extend({
+  {
+    type = "technology",
+    name = "carbon-fiber",
+    icon_size = 256,
+    icon = "__bzcarbon__/graphics/technology/carbon-fiber.png",
+    effects = {
+      {type="unlock-recipe", recipe="polyacrylonitrile"},
+      {type="unlock-recipe", recipe="carbon-fiber"},
+    },
+    unit =
+    {
+      count = 30,
+      ingredients = 
+          {
+            {"automation-science-pack", 1},
+            {"logistic-science-pack", 1},
+            {"chemical-science-pack", 1},
+          },
+      time = 10,
+    },
+    prerequisites = {"chemical-science-pack", "plastics"},
+    order = "b-b"
+  },
+})
+  util.add_prerequisite("low-density-structure", "carbon-fiber")
+  util.add_prerequisite("exoskeleton-equipment", "carbon-fiber")
+  util.add_prerequisite("military-3", "carbon-fiber")
 end

changelog.txt

@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.5.0
+Date: 2022-12-04
+  Features:
+    - When used with Salt & Chlorine mod, option for carbon fiber (default on).
+---------------------------------------------------------------------------------------------------
 Version: 0.4.7
 Date: 2022-09-25
   Changes:

data-updates.lua

@@ -1,4 +1,5 @@
 require("carbon-recipe-updates")
+require("carbon-fiber-recipe-updates")
 require("map-gen-preset-updates")
 require("carbon-matter")
 require("strange-matter")

data.lua

@@ -6,6 +6,7 @@ require("diamond-particle")
 require("carbon-recipe")
 require("carbon-recipe-k2")  -- must be after carbon-recipe
 require("carbon-recipe-se")
+require("carbon-fiber")
 
 
 local util = require("data-util");

info.json

@@ -1,6 +1,6 @@
 {
     "name": "bzcarbon",
-    "version": "0.4.7",
+    "version": "0.5.0",
     "factorio_version": "1.1",
     "title": "Graphite & Diamonds",
     "author": "Brevven",

settings.lua

@@ -20,13 +20,6 @@ data:extend({
 		default_value = "no",
     allowed_values = {"no", "yes"},
 	},
-  {
-		type = "string-setting",
-		name = "bzcarbon-enable-carbon-fiber",
-		setting_type = "startup",
-		default_value = "no",
-    allowed_values = {"no", "yes"},
-	},
   {
 		type = "string-setting",
 		name = "bzcarbon-enable-rough-diamond",
@@ -57,3 +50,15 @@ data:extend({
     allowed_values = {"no", "yes"},
 	},
 })
+
+if mods.bzchlorine then
+  data:extend({
+    {
+      type = "string-setting",
+      name = "bzcarbon-enable-carbon-fiber",
+      setting_type = "startup",
+      default_value = "yes",
+      allowed_values = {"no", "yes"},
+    },
+  })
+end