Merge branch 'dev' of https://github.com/Arch666Angel/mods into dev

Arch666Angel · Oct 11, 2024 · 5dd7455 · 5dd7455
2 parents c413c3d + 91be31f
commit 5dd7455
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 15 deletions.
diff --git a/angelsindustries/data.lua b/angelsindustries/data.lua
@@ -51,7 +51,11 @@ elseif component_result_multiplier == "easy" then
  angelsmods.industries.component_result_multiplier = 2
  angelsmods.industries.component_crafting_time_multiplier = 1
 elseif component_result_multiplier ~= "hard" then
- console.log("Error: Angels startup setting 'angels-components-component-difficulty' has an invalid value '"..block_result_multiplier.."' configured! Falling back to default...")
+ console.log(
+ "Error: Angels startup setting 'angels-components-component-difficulty' has an invalid value '"
+ .. block_result_multiplier
+ .. "' configured! Falling back to default..."
+ )
 end
 
 angelsmods.industries.block_result_multiplier = 1
@@ -64,7 +68,11 @@ elseif block_result_multiplier == "easy" then
  angelsmods.industries.block_result_multiplier = 2
  angelsmods.industries.block_crafting_time_multiplier = 1
 elseif block_result_multiplier ~= "hard" then
- console.log("Error: Angels startup setting 'angels-components-block-difficulty' has an invalid value '"..block_result_multiplier.." configured! Falling back to default...")
+ console.log(
+ "Error: Angels startup setting 'angels-components-block-difficulty' has an invalid value '"
+ .. block_result_multiplier
+ .. " configured! Falling back to default..."
+ )
 end
 
 -- set triggers for other angel mods

diff --git a/angelsindustries/prototypes/recipes/components-cabling-recipes.lua b/angelsindustries/prototypes/recipes/components-cabling-recipes.lua
@@ -297,7 +297,11 @@ if angelsmods.industries.components then
  { type = "item", name = "angels-cabling", amount = 1 },
  },
  results = {
- { type = "item", name = "angels-servo-motor-1", amount = 1 * angelsmods.industries.component_result_multiplier },
+ {
+ type = "item",
+ name = "angels-servo-motor-1",
+ amount = 1 * angelsmods.industries.component_result_multiplier,
+ },
  },
  allow_decomposition = true,
  icon_size = 32,
@@ -314,7 +318,11 @@ if angelsmods.industries.components then
  { type = "item", name = "angels-cabling", amount = 1 },
  },
  results = {
- { type = "item", name = "angels-servo-motor-2", amount = 1 * angelsmods.industries.component_result_multiplier },
+ {
+ type = "item",
+ name = "angels-servo-motor-2",
+ amount = 1 * angelsmods.industries.component_result_multiplier,
+ },
  },
  icon_size = 32,
  },
@@ -330,7 +338,11 @@ if angelsmods.industries.components then
  { type = "item", name = "cable-shielding-3", amount = 1 },
  },
  results = {
- { type = "item", name = "angels-servo-motor-3", amount = 1 * angelsmods.industries.component_result_multiplier },
+ {
+ type = "item",
+ name = "angels-servo-motor-3",
+ amount = 1 * angelsmods.industries.component_result_multiplier,
+ },
  },
  icon_size = 32,
  },
@@ -346,7 +358,11 @@ if angelsmods.industries.components then
  { type = "item", name = "cable-shielding-4", amount = 1 },
  },
  results = {
- { type = "item", name = "angels-servo-motor-4", amount = 1 * angelsmods.industries.component_result_multiplier },
+ {
+ type = "item",
+ name = "angels-servo-motor-4",
+ amount = 1 * angelsmods.industries.component_result_multiplier,
+ },
  },
  icon_size = 32,
  },
@@ -362,7 +378,11 @@ if angelsmods.industries.components then
  { type = "item", name = "cable-shielding-5", amount = 1 },
  },
  results = {
- { type = "item", name = "angels-servo-motor-5", amount = 1 * angelsmods.industries.component_result_multiplier },
+ {
+ type = "item",
+ name = "angels-servo-motor-5",
+ amount = 1 * angelsmods.industries.component_result_multiplier,
+ },
  },
  icon_size = 32,
  },

diff --git a/angelsindustries/prototypes/recipes/components-construction-recipes.lua b/angelsindustries/prototypes/recipes/components-construction-recipes.lua
@@ -88,7 +88,11 @@ if angelsmods.industries.components then
  { type = "item", name = "angels-girder", amount = 1 },
  },
  results = {
- { type = "item", name = "construction-frame-1", amount = 2 * angelsmods.industries.component_result_multiplier },
+ {
+ type = "item",
+ name = "construction-frame-1",
+ amount = 2 * angelsmods.industries.component_result_multiplier,
+ },
  },
  allow_decomposition = true,
  icon_size = 32,
@@ -105,7 +109,11 @@ if angelsmods.industries.components then
  { type = "item", name = "angels-rivet", amount = 1 },
  },
  results = {
- { type = "item", name = "construction-frame-2", amount = 2 * angelsmods.industries.component_result_multiplier },
+ {
+ type = "item",
+ name = "construction-frame-2",
+ amount = 2 * angelsmods.industries.component_result_multiplier,
+ },
  },
  icon_size = 32,
  },
@@ -122,7 +130,11 @@ if angelsmods.industries.components then
  { type = "item", name = "angels-bracket", amount = 1 },
  },
  results = {
- { type = "item", name = "construction-frame-3", amount = 2 * angelsmods.industries.component_result_multiplier },
+ {
+ type = "item",
+ name = "construction-frame-3",
+ amount = 2 * angelsmods.industries.component_result_multiplier,
+ },
  },
  icon_size = 32,
  },
@@ -140,7 +152,11 @@ if angelsmods.industries.components then
  { type = "item", name = "angels-plating", amount = 1 },
  },
  results = {
- { type = "item", name = "construction-frame-4", amount = 2 * angelsmods.industries.component_result_multiplier },
+ {
+ type = "item",
+ name = "construction-frame-4",
+ amount = 2 * angelsmods.industries.component_result_multiplier,
+ },
  },
  icon_size = 32,
  },
@@ -159,7 +175,11 @@ if angelsmods.industries.components then
  { type = "item", name = "angels-strut", amount = 1 },
  },
  results = {
- { type = "item", name = "construction-frame-5", amount = 2 * angelsmods.industries.component_result_multiplier },
+ {
+ type = "item",
+ name = "construction-frame-5",
+ amount = 2 * angelsmods.industries.component_result_multiplier,
+ },
  },
  icon_size = 32,
  },

diff --git a/angelsindustries/prototypes/recipes/components-electronics-recipes.lua b/angelsindustries/prototypes/recipes/components-electronics-recipes.lua
@@ -466,7 +466,11 @@ if angelsmods.industries.components then
  { type = "item", name = "angels-solder", amount = 2 },
  },
  results = {
- { type = "item", name = "circuit-green-loaded", amount = 1 * angelsmods.industries.component_result_multiplier },
+ {
+ type = "item",
+ name = "circuit-green-loaded",
+ amount = 1 * angelsmods.industries.component_result_multiplier,
+ },
  },
  icon_size = 32,
  },
@@ -484,7 +488,11 @@ if angelsmods.industries.components then
  { type = "item", name = "angels-solder", amount = 3 },
  },
  results = {
- { type = "item", name = "circuit-orange-loaded", amount = 1 * angelsmods.industries.component_result_multiplier },
+ {
+ type = "item",
+ name = "circuit-orange-loaded",
+ amount = 1 * angelsmods.industries.component_result_multiplier,
+ },
  },
  icon_size = 32,
  },
@@ -523,7 +531,11 @@ if angelsmods.industries.components then
  { type = "item", name = "angels-solder", amount = 5 },
  },
  results = {
- { type = "item", name = "circuit-yellow-loaded", amount = 1 * angelsmods.industries.component_result_multiplier },
+ {
+ type = "item",
+ name = "circuit-yellow-loaded",
+ amount = 1 * angelsmods.industries.component_result_multiplier,
+ },
  },
  icon_size = 32,
  },