Format Code

Arch666Angel · Nov 25, 2023 · 87bc8a8 · 87bc8a8
1 parent b823bdd
commit 87bc8a8
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 41 deletions.
diff --git a/angelsbioprocessing/prototypes/recipes/crop-farming-processing-nutrients.lua b/angelsbioprocessing/prototypes/recipes/crop-farming-processing-nutrients.lua
@@ -13,9 +13,13 @@ data:extend({
       { type = "fluid", name = "liquid-nutrient-pulp", amount = 80 },
     },
     always_show_products = true,
-    icons = angelsmods.functions.create_viscous_liquid_recipe_icon(nil, { { 214, 135, 010 }, nil, { 239, 168, 044 } }, {
-      "solid-beans",
-    }),
+    icons = angelsmods.functions.create_viscous_liquid_recipe_icon(
+      nil,
+      { { 214, 135, 010 }, nil, { 239, 168, 044 } },
+      {
+        "solid-beans",
+      }
+    ),
     order = "a[nutrient-extraction]-a",
   },
   {
@@ -32,9 +36,13 @@ data:extend({
       { type = "fluid", name = "liquid-nutrient-pulp", amount = 70 },
     },
     always_show_products = true,
-    icons = angelsmods.functions.create_viscous_liquid_recipe_icon(nil, { { 214, 135, 010 }, nil, { 239, 168, 044 } }, {
-      "solid-corn",
-    }),
+    icons = angelsmods.functions.create_viscous_liquid_recipe_icon(
+      nil,
+      { { 214, 135, 010 }, nil, { 239, 168, 044 } },
+      {
+        "solid-corn",
+      }
+    ),
     order = "a[nutrient-extraction]-b",
   },
   {
@@ -51,9 +59,13 @@ data:extend({
       { type = "fluid", name = "liquid-nutrient-pulp", amount = 10 },
     },
     always_show_products = true,
-    icons = angelsmods.functions.create_viscous_liquid_recipe_icon(nil, { { 214, 135, 010 }, nil, { 239, 168, 044 } }, {
-      "solid-leafs",
-    }),
+    icons = angelsmods.functions.create_viscous_liquid_recipe_icon(
+      nil,
+      { { 214, 135, 010 }, nil, { 239, 168, 044 } },
+      {
+        "solid-leafs",
+      }
+    ),
     order = "a[nutrient-extraction]-c",
   },
   {
@@ -70,9 +82,13 @@ data:extend({
       { type = "fluid", name = "liquid-nutrient-pulp", amount = 40 },
     },
     always_show_products = true,
-    icons = angelsmods.functions.create_viscous_liquid_recipe_icon(nil, { { 214, 135, 010 }, nil, { 239, 168, 044 } }, {
-      "solid-nuts",
-    }),
+    icons = angelsmods.functions.create_viscous_liquid_recipe_icon(
+      nil,
+      { { 214, 135, 010 }, nil, { 239, 168, 044 } },
+      {
+        "solid-nuts",
+      }
+    ),
     order = "a[nutrient-extraction]-d",
   },
   {
@@ -89,9 +105,13 @@ data:extend({
       { type = "fluid", name = "liquid-nutrient-pulp", amount = 20 },
     },
     always_show_products = true,
-    icons = angelsmods.functions.create_viscous_liquid_recipe_icon(nil, { { 214, 135, 010 }, nil, { 239, 168, 044 } }, {
-      "solid-pips",
-    }),
+    icons = angelsmods.functions.create_viscous_liquid_recipe_icon(
+      nil,
+      { { 214, 135, 010 }, nil, { 239, 168, 044 } },
+      {
+        "solid-pips",
+      }
+    ),
     order = "a[nutrient-extraction]-e",
   },
   {
@@ -108,9 +128,13 @@ data:extend({
       { type = "fluid", name = "liquid-nutrient-pulp", amount = 60 },
     },
     always_show_products = true,
-    icons = angelsmods.functions.create_viscous_liquid_recipe_icon(nil, { { 214, 135, 010 }, nil, { 239, 168, 044 } }, {
-      "solid-fruit",
-    }),
+    icons = angelsmods.functions.create_viscous_liquid_recipe_icon(
+      nil,
+      { { 214, 135, 010 }, nil, { 239, 168, 044 } },
+      {
+        "solid-fruit",
+      }
+    ),
     order = "a[nutrient-extraction]-f",
   },
   -- REFINING

diff --git a/angelspetrochem/prototypes/global-override/bobplates.lua b/angelspetrochem/prototypes/global-override/bobplates.lua
@@ -225,15 +225,15 @@ if mods["bobplates"] then
   -- bob electronics
   if mods["bobelectronics"] then --check if it exists first
     move_item("insulated-cable", "petrochem-solids", "a[petrochem-solids]-c[rubber]-b")
-    --[[
-      Normal Bob's (w or w/o Greenhouses) is 1 wood per 1 rubber per 2 circuit wires.
-      Bob's + Angel's Petrochem is 15 wood per 1 rubber per 2 circuit wires
-      Bob's + Angel's Petrochem + Bob's Greenhouses is 27 wood per 1 rubber per 2 circuit wires.
-      Bob's + Angel's Bioprocessing (w or w/o Greenhouses) is 30 wood per 1 rubber per 2 circuit wires.
-      How much tinned wire, and the yield is caculated by:
-          insulated-cable amount = wood_per_rubber * 2
-          tinned-copper-cable amount = wood_per_rubber * 2
-          energy_required = wood_per_rubber / 2
+    --[[
+      Normal Bob's (w or w/o Greenhouses) is 1 wood per 1 rubber per 2 circuit wires.
+      Bob's + Angel's Petrochem is 15 wood per 1 rubber per 2 circuit wires
+      Bob's + Angel's Petrochem + Bob's Greenhouses is 27 wood per 1 rubber per 2 circuit wires.
+      Bob's + Angel's Bioprocessing (w or w/o Greenhouses) is 30 wood per 1 rubber per 2 circuit wires.
+      How much tinned wire, and the yield is caculated by:
+          insulated-cable amount = wood_per_rubber * 2
+          tinned-copper-cable amount = wood_per_rubber * 2
+          energy_required = wood_per_rubber / 2
       ]]
     local wood_per_rubber = 15
     if angelsmods.bioprocessing then

diff --git a/angelsrefining/prototypes/angels-functions.lua b/angelsrefining/prototypes/angels-functions.lua
@@ -209,15 +209,15 @@ local icon_tints_table = {
   Aw = { { 194, 227, 091 }, { 184, 239, 000 }, { 156, 207, 000 } }, --Alien Feed (gas/water)
   Oc = { { 044, 044, 044 }, { 140, 000, 000 }, { 140, 000, 000 } }, -- Carbon (oxides) darker for less contrast
 }
---[[{ unused materials
-  Ne = {{179, 227, 245}}, Ar = {{128, 209, 227}}, Sc = {{230, 230, 230}}, V  = {{166, 166, 171}}, Ga = {{194, 143, 143}}, Ge = {{102, 143, 143}}, As = {{189, 128, 227}}, Se = {{255, 161, 000}}, 
-  Br = {{166, 041, 041}}, Kr = {{092, 184, 209}}, Rb = {{112, 046, 176}}, Sr = {{000, 255, 000}}, Y  = {{148, 255, 255}}, Zr = {{148, 224, 224}}, Nb = {{115, 194, 201}}, Mo = {{084, 181, 181}}, 
-  Tc = {{059, 158, 158}}, Ru = {{036, 143, 143}}, Rh = {{010, 125, 140}}, Pd = {{000, 105, 133}}, Cd = {{255, 217, 143}}, In = {{166, 117, 115}}, Sb = {{158, 099, 181}}, Te = {{212, 122, 000}}, 
-  I  = {{148, 000, 148}}, Xe = {{066, 158, 176}}, Ba = {{000, 201, 000}}, La = {{112, 212, 255}}, Ce = {{255, 255, 199}}, Pr = {{217, 255, 199}}, Nd = {{199, 255, 199}}, Pm = {{163, 255, 199}}, 
-  Sm = {{143, 255, 199}}, Eu = {{097, 255, 199}}, Gd = {{069, 255, 199}}, Tb = {{048, 255, 199}}, Dy = {{031, 255, 199}}, Ho = {{000, 255, 156}}, Er = {{000, 230, 117}}, Tm = {{000, 212, 082}},  
-  Yb = {{000, 191, 056}}, Lu = {{000, 171, 036}}, Hf = {{077, 194, 255}}, Ta = {{077, 166, 255}}, Re = {{038, 125, 171}}, Ir = {{023, 084, 135}}, Tl = {{166, 084, 077}}, Bi = {{158, 079, 181}}, 
-  At = {{117, 079, 069}}, Rn = {{066, 130, 150}}, Fr = {{066, 000, 102}}, Ra = {{000, 125, 000}}, Ac = {{112, 171, 250}}, Bk = {{138, 079, 227}}, Cf = {{161, 054, 212}}, Es = {{179, 031, 212}}, 
-  Fm = {{179, 031, 186}}, Md = {{179, 013, 166}}, No = {{189, 013, 135}}, Lr = {{199, 000, 102}}, Rf = {{204, 000, 089}}, Db = {{209, 000, 079}}, Sg = {{217, 000, 069}}, Bh = {{224, 000, 056}}, 
+--[[{ unused materials
+  Ne = {{179, 227, 245}}, Ar = {{128, 209, 227}}, Sc = {{230, 230, 230}}, V  = {{166, 166, 171}}, Ga = {{194, 143, 143}}, Ge = {{102, 143, 143}}, As = {{189, 128, 227}}, Se = {{255, 161, 000}}, 
+  Br = {{166, 041, 041}}, Kr = {{092, 184, 209}}, Rb = {{112, 046, 176}}, Sr = {{000, 255, 000}}, Y  = {{148, 255, 255}}, Zr = {{148, 224, 224}}, Nb = {{115, 194, 201}}, Mo = {{084, 181, 181}}, 
+  Tc = {{059, 158, 158}}, Ru = {{036, 143, 143}}, Rh = {{010, 125, 140}}, Pd = {{000, 105, 133}}, Cd = {{255, 217, 143}}, In = {{166, 117, 115}}, Sb = {{158, 099, 181}}, Te = {{212, 122, 000}}, 
+  I  = {{148, 000, 148}}, Xe = {{066, 158, 176}}, Ba = {{000, 201, 000}}, La = {{112, 212, 255}}, Ce = {{255, 255, 199}}, Pr = {{217, 255, 199}}, Nd = {{199, 255, 199}}, Pm = {{163, 255, 199}}, 
+  Sm = {{143, 255, 199}}, Eu = {{097, 255, 199}}, Gd = {{069, 255, 199}}, Tb = {{048, 255, 199}}, Dy = {{031, 255, 199}}, Ho = {{000, 255, 156}}, Er = {{000, 230, 117}}, Tm = {{000, 212, 082}},  
+  Yb = {{000, 191, 056}}, Lu = {{000, 171, 036}}, Hf = {{077, 194, 255}}, Ta = {{077, 166, 255}}, Re = {{038, 125, 171}}, Ir = {{023, 084, 135}}, Tl = {{166, 084, 077}}, Bi = {{158, 079, 181}}, 
+  At = {{117, 079, 069}}, Rn = {{066, 130, 150}}, Fr = {{066, 000, 102}}, Ra = {{000, 125, 000}}, Ac = {{112, 171, 250}}, Bk = {{138, 079, 227}}, Cf = {{161, 054, 212}}, Es = {{179, 031, 212}}, 
+  Fm = {{179, 031, 186}}, Md = {{179, 013, 166}}, No = {{189, 013, 135}}, Lr = {{199, 000, 102}}, Rf = {{204, 000, 089}}, Db = {{209, 000, 079}}, Sg = {{217, 000, 069}}, Bh = {{224, 000, 056}}, 
   Hs = {{230, 000, 046}}, Mt = {{235, 000, 038}}, }]]
 
 local function get_molecule_codes(molec_formula)
@@ -1061,11 +1061,11 @@ function angelsmods.functions.get_recipe_tints(layers, opacity)
     secondary = (layers[2] ~= nil) and tints[2] or nil,
     tertiary = (layers[3] ~= nil) and tints[3] or nil,
     quaternary = (layers[4] ~= nil) and tints[4] or nil,
-    --[[quinary = (layers[5] ~= nil) and tints[5] or nil, --this and the remaining ones are not currently supported by base game
-    senary = (layers[6] ~= nil) and tints[6] or nil,
-    septenary = (layers[7] ~= nil) and tints[7] or nil,
-    octanry = (layers[8] ~= nil) and tints[8] or nil,
-    nonary = (layers[9] ~= nil) and tints[9] or nil,
+    --[[quinary = (layers[5] ~= nil) and tints[5] or nil, --this and the remaining ones are not currently supported by base game
+    senary = (layers[6] ~= nil) and tints[6] or nil,
+    septenary = (layers[7] ~= nil) and tints[7] or nil,
+    octanry = (layers[8] ~= nil) and tints[8] or nil,
+    nonary = (layers[9] ~= nil) and tints[9] or nil,
     denary = (layers[10] ~= nil) and tints[10] or nil]]
   }
 end