Updating glass fiber casting recipes (#939)

Arch666Angel · Oct 2, 2023 · a279812 · a279812
1 parent 438d65c
commit a279812
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 6 deletions.
diff --git a/angelsindustries/prototypes/overrides/components-base-recipe-update.lua b/angelsindustries/prototypes/overrides/components-base-recipe-update.lua
@@ -7,15 +7,21 @@ if angelsmods.industries.components then
   OV.add_unlock("angels-components-weapons-basic", "submachine-gun")
 
   --battery requirements
+  OV.remove_prereq("angels-glass-smelting-3", "strand-casting-3")
   OV.remove_unlock("angels-glass-smelting-2", "angels-coil-glass-fiber")
-  OV.remove_prereq("angels-glass-smelting-2", "strand-casting-2")
+  OV.remove_unlock("angels-glass-smelting-3", "angels-coil-glass-fiber-fast")
   OV.add_unlock("angels-glass-smelting-1", "angels-coil-glass-fiber")
+  OV.add_unlock("angels-glass-smelting-2", "angels-coil-glass-fiber-fast")
   OV.add_prereq("angels-glass-smelting-1", "strand-casting-1")
   OV.patch_recipes({
     {
       name = "angels-coil-glass-fiber",
       category = "strand-casting",
     },
+    {
+      name = "angels-coil-glass-fiber-fast",
+      category = "strand-casting-2",
+    },
   })
   --battery usage
   --vanilla replacements

diff --git a/angelssmelting/changelog.txt b/angelssmelting/changelog.txt
@@ -5,6 +5,7 @@ Date: xx.xx.xxxx
     - Increased the tech and required machine tier of Chrome and Platinum (909)
     - Allow Fibreglass boards to be made in Bob's Electronics assembling machines (921)
     - Enabled productivity modules for Glass, Glass fiber, and Fibreglass recipes (929)
+    - Added water to recipe Glass fiber casting 1. Added new recipe Glass fiber casting 2 (939)
   Bugfixes:
     - Another attempt at fixed smoke on the blast furnace
     - Fixed names and descriptions of Bronze processing and Brass processing techs from Bob's MCI mod (926)

diff --git a/angelssmelting/prototypes/override/smelting-override-glass.lua b/angelssmelting/prototypes/override/smelting-override-glass.lua
@@ -97,6 +97,7 @@ if angelsmods.trigger.smelting_products["glass"].fibre then
 else
   angelsmods.functions.add_flag("angels-coil-glass-fiber", "hidden")
   OV.disable_recipe({ "angels-coil-glass-fiber" })
+  OV.disable_recipe({ "angels-coil-glass-fiber-fast" })
 end
 
 -------------------------------------------------------------------------------

diff --git a/angelssmelting/prototypes/override/smelting-override-productivity.lua b/angelssmelting/prototypes/override/smelting-override-productivity.lua
@@ -45,6 +45,7 @@ angelsmods.functions.allow_productivity("angels-plate-glass-1")
 angelsmods.functions.allow_productivity("angels-plate-glass-2")
 angelsmods.functions.allow_productivity("angels-plate-glass-3")
 angelsmods.functions.allow_productivity("angels-coil-glass-fiber")
+angelsmods.functions.allow_productivity("angels-coil-glass-fiber-fast")
 angelsmods.functions.allow_productivity("angels-glass-fiber-board")
 
 angelsmods.functions.allow_productivity("angels-plate-silver")

diff --git a/angelssmelting/prototypes/recipes/smelting-glass.lua b/angelssmelting/prototypes/recipes/smelting-glass.lua
@@ -117,6 +117,7 @@ data:extend({
       energy_required = 4,
       ingredients = {
         { type = "fluid", name = "liquid-molten-glass", amount = 80 },
+        { type = "fluid", name = "water", amount = 40 },
       },
       results = {
         { type = "item", name = "angels-coil-glass-fiber", amount = 4 },
@@ -127,12 +128,57 @@ data:extend({
       energy_required = 4,
       ingredients = {
         { type = "fluid", name = "liquid-molten-glass", amount = 100 * intermediatemulti },
+        { type = "fluid", name = "water", amount = 40 },
       },
       results = {
         { type = "item", name = "angels-coil-glass-fiber", amount = 4 },
       },
     },
-    order = "c[angels-coil-glass-fiber]",
+    icons = angelsmods.functions.add_number_icon_layer(
+      angelsmods.functions.get_object_icons("angels-coil-glass-fiber"),
+      1,
+      angelsmods.smelting.number_tint
+    ),
+    order = "c[angels-coil-glass-fiber]-a",
+    crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-glass"),
+  },
+  {
+    type = "recipe",
+    name = "angels-coil-glass-fiber-fast",
+    category = "strand-casting-3",
+    subgroup = "angels-glass-casting",
+    normal = {
+      enabled = false,
+      energy_required = 2,
+      ingredients = {
+        { type = "fluid", name = "liquid-molten-glass", amount = 140 },
+        { type = "fluid", name = "liquid-coolant", amount = 40 },
+      },
+      results = {
+        { type = "item", name = "angels-coil-glass-fiber", amount = 8 },
+        { type = "fluid", name = "liquid-coolant-used", amount = 40, catalyst_amount = 40, temperature = 300 },
+      },
+      main_product = "angels-coil-glass-fiber",
+    },
+    expensive = {
+      enabled = false,
+      energy_required = 2,
+      ingredients = {
+        { type = "fluid", name = "liquid-molten-glass", amount = 180 * intermediatemulti },
+        { type = "fluid", name = "liquid-coolant", amount = 40 },
+      },
+      results = {
+        { type = "item", name = "angels-coil-glass-fiber", amount = 8 },
+        { type = "fluid", name = "liquid-coolant-used", amount = 40, catalyst_amount = 40, temperature = 300 },
+      },
+      main_product = "angels-coil-glass-fiber",
+    },
+    icons = angelsmods.functions.add_number_icon_layer(
+      angelsmods.functions.get_object_icons("angels-coil-glass-fiber"),
+      2,
+      angelsmods.smelting.number_tint
+    ),
+    order = "c[angels-coil-glass-fiber]-b",
     crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-molten-glass"),
   },
   -- CASTING RESULT

diff --git a/angelssmelting/prototypes/technology/smelting-glass.lua b/angelssmelting/prototypes/technology/smelting-glass.lua
@@ -81,7 +81,7 @@ data:extend({
     prerequisites = {
       --"angels-metallurgy-4",
       "powder-metallurgy-4",
-      --[["strand-casting-1",]]
+      "strand-casting-3",
       "angels-glass-smelting-2",
       "angels-aluminium-smelting-2",
       "angels-tin-casting-3",
@@ -101,10 +101,10 @@ data:extend({
         type = "unlock-recipe",
         recipe = "angels-plate-glass-3",
       },
-      --[[{
+      {
         type = "unlock-recipe",
-        recipe = "angels-coil-glass-fiber"
-      },]]
+        recipe = "angels-coil-glass-fiber-fast",
+      },
     },
     unit = {
       count = 250,