Merge pull request #981 from KiwiHawk/Tungsten-Smelting

Rework tungsten smelting recipes
Arch666Angel · May 26, 2024 · 2bcbbe9 · 2bcbbe9
2 parents 5a9116f + ecf788a
commit 2bcbbe9
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 46 deletions.
diff --git a/angelssmelting/changelog.txt b/angelssmelting/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.6.24
+Date: ???
+  Changes:
+    - Rebalance Tungsten Smelting Recipes (980)
+---------------------------------------------------------------------------------------------------
 Version: 0.6.23
 Date: 21.02.2024
   Changes:

diff --git a/angelssmelting/info.json b/angelssmelting/info.json
@@ -1,6 +1,6 @@
 {
   "name": "angelssmelting",
-  "version": "0.6.23",
+  "version": "0.6.24",
   "factorio_version": "1.1",
   "title": "Angel's Smelting",
   "author": "Arch666Angel",

diff --git a/angelssmelting/prototypes/items/angels-tungsten.lua b/angelssmelting/prototypes/items/angels-tungsten.lua
@@ -44,7 +44,7 @@ data:extend({
       { { 235, 235, 240 }, { 235, 235, 240 }, { 135, 090, 023, 0.75 }, { 135, 090, 023, 0.75 } }
     ),
     subgroup = "angels-tungsten",
-    order = "d",
+    order = "f",
     default_temperature = 3422,
     heat_capacity = "0KJ",
     base_color = { r = 136 / 255, g = 98 / 255, b = 65 / 255 },
@@ -57,7 +57,7 @@ data:extend({
     icon = "__angelssmelting__/graphics/icons/solid-tungsten-oxide.png",
     icon_size = 32,
     subgroup = "angels-tungsten",
-    order = "e",
+    order = "d",
     stack_size = 200,
   },
   {
@@ -71,7 +71,7 @@ data:extend({
       "WFF"
     ),
     subgroup = "angels-tungsten",
-    order = "f",
+    order = "g",
     default_temperature = 0,
     heat_capacity = "0KJ",
     base_color = { r = 136 / 255, g = 98 / 255, b = 65 / 255 },
@@ -84,7 +84,7 @@ data:extend({
     icon = "__angelssmelting__/graphics/icons/solid-ammonium-paratungstate.png",
     icon_size = 32,
     subgroup = "angels-tungsten",
-    order = "g",
+    order = "e",
     stack_size = 200,
   },
   -- SMELTING RESULTS

diff --git a/angelssmelting/prototypes/override/smelting-override-tungsten.lua b/angelssmelting/prototypes/override/smelting-override-tungsten.lua
@@ -29,7 +29,7 @@ if angelsmods.trigger.smelting_products["tungsten"].powder then
   if mods["bobplates"] then
     OV.global_replace_item("solid-tungsten-oxide", "tungsten-oxide")
     angelsmods.functions.add_flag("solid-tungsten-oxide", "hidden")
-    angelsmods.functions.move_item("tungsten-oxide", "angels-tungsten", "e")
+    angelsmods.functions.move_item("tungsten-oxide", "angels-tungsten", "d")
     data.raw["item"]["tungsten-oxide"].icon = "__angelssmelting__/graphics/icons/solid-tungsten-oxide.png"
     data.raw["item"]["tungsten-oxide"].icon_size = 32
     data.raw["item"]["tungsten-oxide"].icon_mipmaps = 1

diff --git a/angelssmelting/prototypes/recipes/smelting-tungsten.lua b/angelssmelting/prototypes/recipes/smelting-tungsten.lua
@@ -35,69 +35,70 @@ data:extend({
   {
     type = "recipe",
     name = "tungsten-ore-smelting",
-    category = "liquifying",
+    category = "blast-smelting-4",
     subgroup = "angels-tungsten",
     energy_required = 4,
     enabled = false,
     ingredients = {
       { type = "item", name = "tungsten-ore", amount = 12 },
-      { type = "fluid", name = "gas-hydrogen-chloride", amount = 30 },
+      { type = "fluid", name = "gas-hydrogen", amount = 30 },
     },
     results = {
-      { type = "fluid", name = "liquid-tungstic-acid", amount = 60 },
-      { type = "item", name = "solid-calcium-chloride", amount = 2 },
+      { type = "item", name = "solid-tungsten-oxide", amount = 12 },
     },
-    main_product = "liquid-tungstic-acid",
     always_show_products = true,
-    icons = angelsmods.functions.create_liquid_recipe_icon(
-      nil,
-      { { 135, 090, 023 }, { 170, 170, 180 }, { 170, 170, 180 } }
+    icons = angelsmods.functions.add_number_icon_layer(
+      angelsmods.functions.get_object_icons("solid-tungsten-oxide"),
+      1,
+      angelsmods.smelting.number_tint
     ),
-    crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-tungstic-acid"),
-    order = "d[liquid-tungstic-acid]",
+    order = "d[solid-tungsten-oxide]-a",
   },
   {
     type = "recipe",
     name = "liquid-tungstic-acid-smelting",
-    category = "chemical-smelting-3",
+    category = "chemical-smelting-4",
     subgroup = "angels-tungsten",
     energy_required = 4,
     enabled = false,
     ingredients = {
       { type = "fluid", name = "liquid-tungstic-acid", amount = 120 },
+      { type = "fluid", name = "gas-ammonia", amount = 60 },
     },
     results = {
-      { type = "item", name = "solid-tungsten-oxide", amount = 24 },
+      { type = "item", name = "solid-ammonium-paratungstate", amount = 24 },
       { type = "fluid", name = "water-purified", amount = 60 },
     },
-    main_product = "solid-tungsten-oxide",
+    main_product = "solid-ammonium-paratungstate",
     icons = angelsmods.functions.add_number_icon_layer(
-      angelsmods.functions.get_object_icons("solid-tungsten-oxide"),
-      1,
+      angelsmods.functions.get_object_icons("solid-ammonium-paratungstate"),
+      2,
       angelsmods.smelting.number_tint
     ),
-    order = "e[solid-tungsten-oxide]-a",
+    order = "e[solid-ammonium-paratungstate]-b",
   },
   {
     type = "recipe",
     name = "pellet-tungsten-smelting",
-    category = "chemical-smelting-4",
+    category = "liquifying",
     subgroup = "angels-tungsten",
     energy_required = 4,
     enabled = false,
     ingredients = {
       { type = "item", name = "pellet-tungsten", amount = 4 },
-      { type = "fluid", name = "gas-ammonia", amount = 60 },
+      { type = "fluid", name = "gas-hydrogen-chloride", amount = 30 },
     },
     results = {
-      { type = "item", name = "solid-tungsten-oxide", amount = 12 },
+      { type = "fluid", name = "liquid-tungstic-acid", amount = 60 },
+      { type = "item", name = "solid-calcium-chloride", amount = 2 },
     },
-    icons = angelsmods.functions.add_number_icon_layer(
-      angelsmods.functions.get_object_icons("solid-tungsten-oxide"),
-      2,
-      angelsmods.smelting.number_tint
+    main_product = "liquid-tungstic-acid",
+    icons = angelsmods.functions.create_liquid_recipe_icon(
+      nil,
+      { { 135, 090, 023 }, { 170, 170, 180 }, { 170, 170, 180 } }
     ),
-    order = "e[solid-tungsten-oxide]-b",
+    crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-tungstic-acid"),
+    order = "f[liquid-tungstic-acid]",
   },
   {
     type = "recipe",
@@ -120,7 +121,7 @@ data:extend({
       "WFF"
     ),
     crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("gas-tungsten-hexafluoride"),
-    order = "f[gas-tungsten-hexafluoride]",
+    order = "g[gas-tungsten-hexafluoride]",
   },
   {
     type = "recipe",
@@ -136,7 +137,13 @@ data:extend({
     results = {
       { type = "item", name = "solid-ammonium-paratungstate", amount = 24 },
     },
-    order = "g[solid-ammonium-paratungstate]",
+    always_show_products = true,
+    icons = angelsmods.functions.add_number_icon_layer(
+      angelsmods.functions.get_object_icons("solid-ammonium-paratungstate"),
+      1,
+      angelsmods.smelting.number_tint
+    ),
+    order = "e[solid-ammonium-paratungstate]-a",
   },
   -- SMELTING RESULTS
   {
@@ -154,11 +161,6 @@ data:extend({
       { type = "item", name = "fluorite-ore", amount = 3 },
     },
     main_product = "powder-tungsten",
-    icons = angelsmods.functions.add_number_icon_layer(
-      angelsmods.functions.get_object_icons("powder-tungsten"),
-      1,
-      angelsmods.smelting.number_tint
-    ),
     order = "h[powder-tungsten]-a",
   },
   {
@@ -169,18 +171,19 @@ data:extend({
     energy_required = 4,
     enabled = false,
     ingredients = {
-      { type = "item", name = "solid-ammonium-paratungstate", amount = 24 },
-      { type = "fluid", name = "gas-hydrogen", amount = 60 },
+      { type = "item", name = "solid-ammonium-paratungstate", amount = 12 },
+      { type = "fluid", name = "gas-hydrogen", amount = 30 },
     },
     results = {
-      { type = "item", name = "powder-tungsten", amount = 24 },
+      { type = "item", name = "solid-tungsten-oxide", amount = 12 },
     },
+    always_show_products = true,
     icons = angelsmods.functions.add_number_icon_layer(
-      angelsmods.functions.get_object_icons("powder-tungsten"),
+      angelsmods.functions.get_object_icons("solid-tungsten-oxide"),
       2,
       angelsmods.smelting.number_tint
     ),
-    order = "h[powder-tungsten]-b",
+    order = "d[solid-tungsten-oxide]-b",
   },
   -- CASTING INTERMEDIATE
   {

diff --git a/angelssmelting/prototypes/technology/smelting-tungsten.lua b/angelssmelting/prototypes/technology/smelting-tungsten.lua
@@ -17,10 +17,6 @@ data:extend({
         type = "unlock-recipe",
         recipe = "tungsten-ore-smelting",
       },
-      {
-        type = "unlock-recipe",
-        recipe = "liquid-tungstic-acid-smelting",
-      },
       {
         type = "unlock-recipe",
         recipe = "solid-tungsten-oxide-smelting",
@@ -113,6 +109,10 @@ data:extend({
         type = "unlock-recipe",
         recipe = "pellet-tungsten-smelting",
       },
+      {
+        type = "unlock-recipe",
+        recipe = "liquid-tungstic-acid-smelting",
+      },
     },
     unit = {
       count = 350,