Skip to content

Commit 2bcbbe9

Browse files
KiwiHawkKiwiHawk
authored
Merge pull request #981 from KiwiHawk/Tungsten-Smelting
Rework tungsten smelting recipes
2 parents 5a9116f + ecf788a commit 2bcbbe9

File tree

6 files changed

+54
-46
lines changed

6 files changed

+54
-46
lines changed

‎angelssmelting/changelog.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
---------------------------------------------------------------------------------------------------
2+
Version: 0.6.24
3+
Date: ???
4+
Changes:
5+
- Rebalance Tungsten Smelting Recipes (980)
6+
---------------------------------------------------------------------------------------------------
27
Version: 0.6.23
38
Date: 21.02.2024
49
Changes:

‎angelssmelting/info.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angelssmelting",
3-
"version": "0.6.23",
3+
"version": "0.6.24",
44
"factorio_version": "1.1",
55
"title": "Angel's Smelting",
66
"author": "Arch666Angel",

‎angelssmelting/prototypes/items/angels-tungsten.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ data:extend({
4444
{ { 235, 235, 240 }, { 235, 235, 240 }, { 135, 090, 023, 0.75 }, { 135, 090, 023, 0.75 } }
4545
),
4646
subgroup = "angels-tungsten",
47-
order = "d",
47+
order = "f",
4848
default_temperature = 3422,
4949
heat_capacity = "0KJ",
5050
base_color = { r = 136 / 255, g = 98 / 255, b = 65 / 255 },
@@ -57,7 +57,7 @@ data:extend({
5757
icon = "__angelssmelting__/graphics/icons/solid-tungsten-oxide.png",
5858
icon_size = 32,
5959
subgroup = "angels-tungsten",
60-
order = "e",
60+
order = "d",
6161
stack_size = 200,
6262
},
6363
{
@@ -71,7 +71,7 @@ data:extend({
7171
"WFF"
7272
),
7373
subgroup = "angels-tungsten",
74-
order = "f",
74+
order = "g",
7575
default_temperature = 0,
7676
heat_capacity = "0KJ",
7777
base_color = { r = 136 / 255, g = 98 / 255, b = 65 / 255 },
@@ -84,7 +84,7 @@ data:extend({
8484
icon = "__angelssmelting__/graphics/icons/solid-ammonium-paratungstate.png",
8585
icon_size = 32,
8686
subgroup = "angels-tungsten",
87-
order = "g",
87+
order = "e",
8888
stack_size = 200,
8989
},
9090
-- SMELTING RESULTS

‎angelssmelting/prototypes/override/smelting-override-tungsten.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ if angelsmods.trigger.smelting_products["tungsten"].powder then
2929
if mods["bobplates"] then
3030
OV.global_replace_item("solid-tungsten-oxide", "tungsten-oxide")
3131
angelsmods.functions.add_flag("solid-tungsten-oxide", "hidden")
32-
angelsmods.functions.move_item("tungsten-oxide", "angels-tungsten", "e")
32+
angelsmods.functions.move_item("tungsten-oxide", "angels-tungsten", "d")
3333
data.raw["item"]["tungsten-oxide"].icon = "__angelssmelting__/graphics/icons/solid-tungsten-oxide.png"
3434
data.raw["item"]["tungsten-oxide"].icon_size = 32
3535
data.raw["item"]["tungsten-oxide"].icon_mipmaps = 1

‎angelssmelting/prototypes/recipes/smelting-tungsten.lua

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -35,69 +35,70 @@ data:extend({
3535
{
3636
type = "recipe",
3737
name = "tungsten-ore-smelting",
38-
category = "liquifying",
38+
category = "blast-smelting-4",
3939
subgroup = "angels-tungsten",
4040
energy_required = 4,
4141
enabled = false,
4242
ingredients = {
4343
{ type = "item", name = "tungsten-ore", amount = 12 },
44-
{ type = "fluid", name = "gas-hydrogen-chloride", amount = 30 },
44+
{ type = "fluid", name = "gas-hydrogen", amount = 30 },
4545
},
4646
results = {
47-
{ type = "fluid", name = "liquid-tungstic-acid", amount = 60 },
48-
{ type = "item", name = "solid-calcium-chloride", amount = 2 },
47+
{ type = "item", name = "solid-tungsten-oxide", amount = 12 },
4948
},
50-
main_product = "liquid-tungstic-acid",
5149
always_show_products = true,
52-
icons = angelsmods.functions.create_liquid_recipe_icon(
53-
nil,
54-
{ { 135, 090, 023 }, { 170, 170, 180 }, { 170, 170, 180 } }
50+
icons = angelsmods.functions.add_number_icon_layer(
51+
angelsmods.functions.get_object_icons("solid-tungsten-oxide"),
52+
1,
53+
angelsmods.smelting.number_tint
5554
),
56-
crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-tungstic-acid"),
57-
order = "d[liquid-tungstic-acid]",
55+
order = "d[solid-tungsten-oxide]-a",
5856
},
5957
{
6058
type = "recipe",
6159
name = "liquid-tungstic-acid-smelting",
62-
category = "chemical-smelting-3",
60+
category = "chemical-smelting-4",
6361
subgroup = "angels-tungsten",
6462
energy_required = 4,
6563
enabled = false,
6664
ingredients = {
6765
{ type = "fluid", name = "liquid-tungstic-acid", amount = 120 },
66+
{ type = "fluid", name = "gas-ammonia", amount = 60 },
6867
},
6968
results = {
70-
{ type = "item", name = "solid-tungsten-oxide", amount = 24 },
69+
{ type = "item", name = "solid-ammonium-paratungstate", amount = 24 },
7170
{ type = "fluid", name = "water-purified", amount = 60 },
7271
},
73-
main_product = "solid-tungsten-oxide",
72+
main_product = "solid-ammonium-paratungstate",
7473
icons = angelsmods.functions.add_number_icon_layer(
75-
angelsmods.functions.get_object_icons("solid-tungsten-oxide"),
76-
1,
74+
angelsmods.functions.get_object_icons("solid-ammonium-paratungstate"),
75+
2,
7776
angelsmods.smelting.number_tint
7877
),
79-
order = "e[solid-tungsten-oxide]-a",
78+
order = "e[solid-ammonium-paratungstate]-b",
8079
},
8180
{
8281
type = "recipe",
8382
name = "pellet-tungsten-smelting",
84-
category = "chemical-smelting-4",
83+
category = "liquifying",
8584
subgroup = "angels-tungsten",
8685
energy_required = 4,
8786
enabled = false,
8887
ingredients = {
8988
{ type = "item", name = "pellet-tungsten", amount = 4 },
90-
{ type = "fluid", name = "gas-ammonia", amount = 60 },
89+
{ type = "fluid", name = "gas-hydrogen-chloride", amount = 30 },
9190
},
9291
results = {
93-
{ type = "item", name = "solid-tungsten-oxide", amount = 12 },
92+
{ type = "fluid", name = "liquid-tungstic-acid", amount = 60 },
93+
{ type = "item", name = "solid-calcium-chloride", amount = 2 },
9494
},
95-
icons = angelsmods.functions.add_number_icon_layer(
96-
angelsmods.functions.get_object_icons("solid-tungsten-oxide"),
97-
2,
98-
angelsmods.smelting.number_tint
95+
main_product = "liquid-tungstic-acid",
96+
icons = angelsmods.functions.create_liquid_recipe_icon(
97+
nil,
98+
{ { 135, 090, 023 }, { 170, 170, 180 }, { 170, 170, 180 } }
9999
),
100-
order = "e[solid-tungsten-oxide]-b",
100+
crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("liquid-tungstic-acid"),
101+
order = "f[liquid-tungstic-acid]",
101102
},
102103
{
103104
type = "recipe",
@@ -120,7 +121,7 @@ data:extend({
120121
"WFF"
121122
),
122123
crafting_machine_tint = angelsmods.functions.get_fluid_recipe_tint("gas-tungsten-hexafluoride"),
123-
order = "f[gas-tungsten-hexafluoride]",
124+
order = "g[gas-tungsten-hexafluoride]",
124125
},
125126
{
126127
type = "recipe",
@@ -136,7 +137,13 @@ data:extend({
136137
results = {
137138
{ type = "item", name = "solid-ammonium-paratungstate", amount = 24 },
138139
},
139-
order = "g[solid-ammonium-paratungstate]",
140+
always_show_products = true,
141+
icons = angelsmods.functions.add_number_icon_layer(
142+
angelsmods.functions.get_object_icons("solid-ammonium-paratungstate"),
143+
1,
144+
angelsmods.smelting.number_tint
145+
),
146+
order = "e[solid-ammonium-paratungstate]-a",
140147
},
141148
-- SMELTING RESULTS
142149
{
@@ -154,11 +161,6 @@ data:extend({
154161
{ type = "item", name = "fluorite-ore", amount = 3 },
155162
},
156163
main_product = "powder-tungsten",
157-
icons = angelsmods.functions.add_number_icon_layer(
158-
angelsmods.functions.get_object_icons("powder-tungsten"),
159-
1,
160-
angelsmods.smelting.number_tint
161-
),
162164
order = "h[powder-tungsten]-a",
163165
},
164166
{
@@ -169,18 +171,19 @@ data:extend({
169171
energy_required = 4,
170172
enabled = false,
171173
ingredients = {
172-
{ type = "item", name = "solid-ammonium-paratungstate", amount = 24 },
173-
{ type = "fluid", name = "gas-hydrogen", amount = 60 },
174+
{ type = "item", name = "solid-ammonium-paratungstate", amount = 12 },
175+
{ type = "fluid", name = "gas-hydrogen", amount = 30 },
174176
},
175177
results = {
176-
{ type = "item", name = "powder-tungsten", amount = 24 },
178+
{ type = "item", name = "solid-tungsten-oxide", amount = 12 },
177179
},
180+
always_show_products = true,
178181
icons = angelsmods.functions.add_number_icon_layer(
179-
angelsmods.functions.get_object_icons("powder-tungsten"),
182+
angelsmods.functions.get_object_icons("solid-tungsten-oxide"),
180183
2,
181184
angelsmods.smelting.number_tint
182185
),
183-
order = "h[powder-tungsten]-b",
186+
order = "d[solid-tungsten-oxide]-b",
184187
},
185188
-- CASTING INTERMEDIATE
186189
{

‎angelssmelting/prototypes/technology/smelting-tungsten.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ data:extend({
1717
type = "unlock-recipe",
1818
recipe = "tungsten-ore-smelting",
1919
},
20-
{
21-
type = "unlock-recipe",
22-
recipe = "liquid-tungstic-acid-smelting",
23-
},
2420
{
2521
type = "unlock-recipe",
2622
recipe = "solid-tungsten-oxide-smelting",
@@ -113,6 +109,10 @@ data:extend({
113109
type = "unlock-recipe",
114110
recipe = "pellet-tungsten-smelting",
115111
},
112+
{
113+
type = "unlock-recipe",
114+
recipe = "liquid-tungstic-acid-smelting",
115+
},
116116
},
117117
unit = {
118118
count = 350,

0 commit comments

Comments
 (0)