Skip to content

Commit 5a07189

Browse files
JohnTheCoolingFanJohnTheCoolingFan
committed
Terminology swap: "used-up" to "depleted"
1 parent 8e3c776 commit 5a07189

13 files changed

+71
-52
lines changed

‎graphics/icons/used-up-breeder-fuel-cell-solution-centrifuging.png ‎graphics/icons/breeder-fuel-cell-waste-solution-centrifuging.png

File renamed without changes.

‎graphics/icons/used-up-breeder-fuel-cell-solution.png ‎graphics/icons/breeder-fuel-cell-waste-solution.png

File renamed without changes.

‎graphics/icons/used-up-MOX-fuel-cell.png ‎graphics/icons/depleted-MOX-fuel-cell.png

File renamed without changes.

‎graphics/icons/used-up-breeder-fuel-cell.png ‎graphics/icons/depleted-breeder-fuel-cell.png

File renamed without changes.

‎graphics/icons/used-up-plutonium-fuel-cell.png ‎graphics/icons/depleted-plutonium-fuel-cell.png

File renamed without changes.

‎graphics/icons/used-up-uranium-fuel-cell-solution-centrifuging.png ‎graphics/icons/uranium-fuel-cell-waste-solution-centrifuging.png

File renamed without changes.

‎graphics/icons/used-up-uranium-fuel-cell-solution.png ‎graphics/icons/uranium-fuel-cell-waste-solution.png

File renamed without changes.

‎locale/en/base.cfg

+8-8
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ breeder-reactor=Reactor used for nuclear breeding. Although the direct energy ou
1414
plutonium-239=Plutonium-239
1515
plutonium-238=Plutonium-238
1616
plutonium-fuel-cell=Plutonium fuel cell
17-
used-up-plutonium-fuel-cell=Depleted Plutonium fuel cell
17+
depleted-plutonium-fuel-cell=Depleted Plutonium fuel cell
1818
MOX-fuel-cell=MOX fuel cell
19-
used-up-MOX-fuel-cell=Depleted MOX fuel cell
19+
depleted-MOX-fuel-cell=Depleted MOX fuel cell
2020
MOX-reactor=MOX reactor
2121
breeder-fuel-cell=Breeder fuel cell
22-
used-up-breeder-fuel-cell=Depleted breeder fuel cell
22+
depleted-breeder-fuel-cell=Depleted breeder fuel cell
2323
breeder-reactor=Breeder reactor
2424
plutonium-atomic-artillery-shell=Plutonium Atomic Artillery Shell
2525
plutonium-rounds-magazine=Plutonium rounds magazine
@@ -29,8 +29,8 @@ plutonium-atomic-bomb=Plutonium atomic bomb
2929
plutonium-fuel=Plutonium fuel
3030

3131
[fluid-name]
32-
used-up-uranium-fuel-cell-solution=Uranium nuclear waste solution
33-
used-up-breeder-fuel-cell-solution=Plutonium-rich nuclear waste solution
32+
uranium-fuel-cell-waste-solution=Uranium nuclear waste solution
33+
breeder-fuel-cell-waste-solution=Plutonium-rich nuclear waste solution
3434

3535
[item-description]
3636
MOX-fuel-cell=Fuel cell made out of a mix of Uranium and Plutonium
@@ -45,10 +45,10 @@ advanced-nuclear-fuel-reprocessing=Advanced nuclear fuel reprocessing
4545
advanced-nuclear-fuel-reprocessing-with-barrelling=Advanced nuclear fuel reprocessing (with barrelling)
4646
plutonium-fuel-cell-reprocessing=Plutonium fuel cell reprocessing
4747
MOX-fuel-cell-reprocessing=MOX fuel reprocessing
48-
used-up-uranium-fuel-cell-solution-centrifuging=Uranium nuclear waste solution centrifuging
48+
uranium-fuel-cell-waste-solution-centrifuging=Uranium nuclear waste solution centrifuging
4949
breeder-fuel-cell-reprocessing=Breeder fuel cell reprocessing
5050
breeder-fuel-cell-reprocessing-with-barreling=Breeder fuel cell reprocessing (with barrelling)
51-
used-up-breeder-fuel-cell-solution-centrifuging=Plutonium-rich nuclear waste solution centrifuging
51+
breeder-fuel-cell-waste-solution-centrifuging=Plutonium-rich nuclear waste solution centrifuging
5252
breeder-fuel-cell-from-uranium-cell=Breeder fuel cell from depleted uranium fuel
5353
breeder-fuel-cell-from-MOX-fuel-cell=Breeder fuel cell from depleted MOX fuel
5454

@@ -65,7 +65,7 @@ plutonium-ammo=Plutonium ammo
6565
plutonium-atomic-bomb=Plutonium atomic bomb
6666

6767
[technology-description]
68-
plutonium-processing=Processing of plutonium, radioactive element that cannot be harvested from nature but can be extracted from used up uranium fuel cells.
68+
plutonium-processing=Processing of plutonium, radioactive element that cannot be harvested from nature but can be extracted from depleted uranium fuel cells.
6969
plutonium-nuclear-power=Plutonium is a powerful source of energy, especially its higher-energy isotopes.
7070
MOX-nuclear-power=Mix of less active Plutonium and Uranium isotopes can be used to generate cheaper energy.
7171
plutonium-reprocessing=Plutonium-based fuel cells can be recycled after use.

‎migrations/1.7.3.json

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
2+
{
3+
"item":
4+
[
5+
["used-up-MOX-fuel-cell", "depleted-MOX-fuel-cell"],
6+
["used-up-plutonium-fuel-cell", "depleted-plutonium-fuel-cell"],
7+
["used-up-breeder-fuel-cell", "depleted-breeder-fuel-cell"]
8+
],
9+
"fluid":
10+
[
11+
["used-up-uranium-fuel-cell-solution", "uranium-fuel-cell-waste-solution"],
12+
["used-up-breeder-fuel-cell-solution", "breeder-fuel-cell-waste-solution"]
13+
],
14+
"recipe":
15+
[
16+
["used-up-uranium-fuel-cell-solution-centrifuging", "uranium-fuel-cell-waste-solution-centrifuging"],
17+
["used-up-breeder-fuel-cell-solution-centrifuging", "breeder-fuel-cell-waste-solution-centrifuging"]
18+
]
19+
}

‎prototypes/fluid/fluids.lua

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
data:extend({
22
{
33
type = "fluid",
4-
name = "used-up-uranium-fuel-cell-solution",
4+
name = "uranium-fuel-cell-waste-solution",
55
subgroup = "fluid",
66
base_color = { r = 0.0, g = 1.0, b = 0.1 },
77
flow_color = { r = 0.1, g = 0.8, b = 0.2 },
88
default_temperature = 0,
9-
icon = "__PlutoniumEnergy__/graphics/icons/used-up-uranium-fuel-cell-solution.png",
9+
icon = "__PlutoniumEnergy__/graphics/icons/uranium-fuel-cell-waste-solution.png",
1010
icon_size = 64,
1111
icon_mipmaps = 4
1212
},
1313
{
1414
type = "fluid",
15-
name = "used-up-breeder-fuel-cell-solution",
15+
name = "breeder-fuel-cell-waste-solution",
1616
subgroup = "fluid",
1717
base_color = { r = 0.0, g = 0.9, b = 0.9 },
1818
flow_color = { r = 0.1, g = 0.8, b = 0.8 },
1919
default_temperature = 0,
20-
icon = "__PlutoniumEnergy__/graphics/icons/used-up-breeder-fuel-cell-solution.png",
20+
icon = "__PlutoniumEnergy__/graphics/icons/breeder-fuel-cell-waste-solution.png",
2121
icon_size = 64,
2222
icon_mipmaps = 4
2323
}

‎prototypes/item/items.lua

+12-12
Original file line numberDiff line numberDiff line change
@@ -119,21 +119,21 @@ data:extend({
119119
subgroup = "nuclear-plutonium",
120120
order = "r[uranium-processing]-c[plutonium-fuel-cell]",
121121
fuel_category = "nuclear",
122-
burnt_result = "used-up-plutonium-fuel-cell",
122+
burnt_result = "depleted-plutonium-fuel-cell",
123123
fuel_value = "20GJ",
124124
fuel_glow_color = { 0, 1, 1, 0 },
125125
stack_size = 50,
126126
weight = 100 * kg
127127
},
128128
{
129129
type = "item",
130-
name = "used-up-plutonium-fuel-cell",
131-
icon = "__PlutoniumEnergy__/graphics/icons/used-up-plutonium-fuel-cell.png",
130+
name = "depleted-plutonium-fuel-cell",
131+
icon = "__PlutoniumEnergy__/graphics/icons/depleted-plutonium-fuel-cell.png",
132132
icon_size = 64,
133133
icon_mipmaps = 4,
134134
flags = {},
135135
subgroup = "nuclear-plutonium",
136-
order = "t[used-up-plutonium-fuel-cell]",
136+
order = "t[depleted-plutonium-fuel-cell]",
137137
stack_size = 50,
138138
weight = 100 * kg
139139
},
@@ -164,19 +164,19 @@ data:extend({
164164
subgroup = "nuclear-plutonium",
165165
order = "r[uranium-processing]-b[MOX-fuel-cell]",
166166
fuel_category = "MOX",
167-
burnt_result = "used-up-MOX-fuel-cell",
167+
burnt_result = "depleted-MOX-fuel-cell",
168168
fuel_value = "3GJ",
169169
stack_size = 100,
170170
weight = 50 * kg
171171
},
172172
{
173173
type = "item",
174-
name = "used-up-MOX-fuel-cell",
175-
icon = "__PlutoniumEnergy__/graphics/icons/used-up-MOX-fuel-cell.png",
174+
name = "depleted-MOX-fuel-cell",
175+
icon = "__PlutoniumEnergy__/graphics/icons/depleted-MOX-fuel-cell.png",
176176
icon_size = 64,
177177
flags = {},
178178
subgroup = "nuclear-plutonium",
179-
order = "s[used-up-MOX-fuel-cell]",
179+
order = "s[depleted-MOX-fuel-cell]",
180180
stack_size = 100,
181181
weight = 50 * kg
182182
},
@@ -210,20 +210,20 @@ data:extend({
210210
subgroup = 'nuclear-breeding',
211211
order = 'r[uranium-processing]-b[obreeder-fuel-cell]-a[regular]',
212212
fuel_category = 'nuclear-breeder',
213-
burnt_result = 'used-up-breeder-fuel-cell',
213+
burnt_result = 'depleted-breeder-fuel-cell',
214214
fuel_value = '10GJ',
215215
stack_size = 5,
216216
weight = 1000 * kg
217217
},
218218
{
219219
type = 'item',
220-
name = 'used-up-breeder-fuel-cell',
221-
icon = '__PlutoniumEnergy__/graphics/icons/used-up-breeder-fuel-cell.png',
220+
name = 'depleted-breeder-fuel-cell',
221+
icon = '__PlutoniumEnergy__/graphics/icons/depleted-breeder-fuel-cell.png',
222222
icon_size = 64,
223223
icon_mipmaps = 4,
224224
flags = {},
225225
subgroup = 'nuclear-breeding',
226-
order = 's[used-up-xbreeder-fuel-cell]',
226+
order = 's[depleted-xbreeder-fuel-cell]',
227227
stack_size = 5,
228228
weight = 1000 * kg
229229
},

‎prototypes/recipe/recipes.lua

+26-26
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ data:extend({
6161
},
6262
energy_required = 1,
6363
results = {
64-
{ type = 'fluid', name = 'used-up-uranium-fuel-cell-solution', amount = 50 }
64+
{ type = 'fluid', name = 'uranium-fuel-cell-waste-solution', amount = 50 }
6565
},
6666
order = 'r[uranium-processing]-c[reprocessing]-b[advanced-uranium]-a[no-barreling]',
6767
subgroup = 'intermediate-product',
@@ -95,7 +95,7 @@ data:extend({
9595
},
9696
energy_required = 1,
9797
results = {
98-
{ type = 'item', name = 'used-up-uranium-fuel-cell-solution-barrel', amount = 1 }
98+
{ type = 'item', name = 'uranium-fuel-cell-waste-solution-barrel', amount = 1 }
9999
},
100100
order = 'r[uranium-processing]-c[reprocessing]-b[advanced-uranium]-b[with-barreling]',
101101
subgroup = 'intermediate-product',
@@ -111,13 +111,13 @@ data:extend({
111111
},
112112
{
113113
type = 'recipe',
114-
name = 'used-up-uranium-fuel-cell-solution-centrifuging',
115-
icon = '__PlutoniumEnergy__/graphics/icons/used-up-uranium-fuel-cell-solution-centrifuging.png',
114+
name = 'uranium-fuel-cell-waste-solution-centrifuging',
115+
icon = '__PlutoniumEnergy__/graphics/icons/uranium-fuel-cell-waste-solution-centrifuging.png',
116116
icon_size = 64,
117117
category = 'centrifuging',
118118
enabled = false,
119119
ingredients = {
120-
{ type = 'item', name = 'used-up-uranium-fuel-cell-solution-barrel', amount = 10 }
120+
{ type = 'item', name = 'uranium-fuel-cell-waste-solution-barrel', amount = 10 }
121121
},
122122
energy_required = 60,
123123
results = {
@@ -155,16 +155,16 @@ data:extend({
155155
enabled = false,
156156
category = "centrifuging",
157157
ingredients = {
158-
{ type = "item", name = "used-up-plutonium-fuel-cell", amount = 10 }
158+
{ type = "item", name = "depleted-plutonium-fuel-cell", amount = 10 }
159159
},
160160
icons = reprocessing_icon(
161-
'__PlutoniumEnergy__/graphics/icons/used-up-plutonium-fuel-cell.png',
161+
'__PlutoniumEnergy__/graphics/icons/depleted-plutonium-fuel-cell.png',
162162
{ 0, 1, 1, 1 }, 0.75
163163
),
164164
icon_size = 64,
165165
icon_mipmaps = 4,
166166
subgroup = "nuclear-plutonium",
167-
order = "r[uranium-processing]-c[reprocessing]-c[MOX]",
167+
order = "r[uranium-processing]-c[reprocessing]-d[plutonium]",
168168
main_product = "",
169169
crafting_machine_tint = {
170170
primary = { r = 0.000, g = 1.000, b = 0.961, a = 1.000 } -- #00FFF5
@@ -204,9 +204,9 @@ data:extend({
204204
energy_required = 50,
205205
enabled = false,
206206
category = "centrifuging",
207-
ingredients = { { type = "item", name = "used-up-MOX-fuel-cell", amount = 20 } },
207+
ingredients = { { type = "item", name = "depleted-MOX-fuel-cell", amount = 20 } },
208208
icons = reprocessing_icon(
209-
'__PlutoniumEnergy__/graphics/icons/used-up-MOX-fuel-cell.png',
209+
'__PlutoniumEnergy__/graphics/icons/depleted-MOX-fuel-cell.png',
210210
{ 0, 1, 0.5, 1 }, 0.75
211211
),
212212
icon_size = 64,
@@ -287,7 +287,7 @@ data:extend({
287287
icon_mipmaps = 4,
288288
},
289289
{
290-
icon = '__PlutoniumEnergy__/graphics/icons/used-up-MOX-fuel-cell.png',
290+
icon = '__PlutoniumEnergy__/graphics/icons/depleted-MOX-fuel-cell.png',
291291
icon_size = 64,
292292
icon_mipmaps = 4,
293293
scale = 0.5 * 0.6,
@@ -298,9 +298,9 @@ data:extend({
298298
energy_required = 7.5,
299299
enabled = false,
300300
ingredients = {
301-
{ type = "item", name = 'iron-plate', amount = 10 },
302-
{ type = "item", name = 'used-up-MOX-fuel-cell', amount = 5 },
303-
{ type = "item", name = 'uranium-238', amount = 10 }
301+
{ type = "item", name = 'iron-plate', amount = 10 },
302+
{ type = "item", name = 'depleted-MOX-fuel-cell', amount = 5 },
303+
{ type = "item", name = 'uranium-238', amount = 10 }
304304
},
305305
crafting_machine_tint = {
306306
primary = { r = 1.000, g = 0.000, b = 0.388, a = 1.000 } -- #FF0063
@@ -314,20 +314,20 @@ data:extend({
314314
name = 'breeder-fuel-cell-reprocessing',
315315
localised_name = { 'recipe-name.breeder-fuel-cell-reprocessing' },
316316
icons = reprocessing_icon(
317-
'__PlutoniumEnergy__/graphics/icons/used-up-breeder-fuel-cell.png',
317+
'__PlutoniumEnergy__/graphics/icons/depleted-breeder-fuel-cell.png',
318318
{ 1, 0, 1, 1 }, 0.75
319319
),
320320
icon_size = 64,
321321
icon_mipmamps = 4,
322322
category = 'chemistry',
323323
enabled = false,
324324
ingredients = {
325-
{ type = 'item', name = 'used-up-breeder-fuel-cell', amount = 1 },
326-
{ type = 'fluid', name = 'sulfuric-acid', amount = 125 }
325+
{ type = 'item', name = 'depleted-breeder-fuel-cell', amount = 1 },
326+
{ type = 'fluid', name = 'sulfuric-acid', amount = 125 }
327327
},
328328
energy_required = 2,
329329
results = {
330-
{ type = 'fluid', name = 'used-up-breeder-fuel-cell-solution', amount = 250 }
330+
{ type = 'fluid', name = 'breeder-fuel-cell-waste-solution', amount = 250 }
331331
},
332332
order = 'r[uranium-processing]-c[reprocessing]-d[breeder]-a[no-barreling]',
333333
subgroup = 'nuclear-breeding',
@@ -347,21 +347,21 @@ data:extend({
347347
name = 'breeder-fuel-cell-reprocessing-with-barrelling',
348348
localised_name = { 'recipe-name.breeder-fuel-cell-reprocessing-with-barreling' },
349349
icons = reprocessing_icon_barrel(
350-
'__PlutoniumEnergy__/graphics/icons/used-up-breeder-fuel-cell.png',
350+
'__PlutoniumEnergy__/graphics/icons/depleted-breeder-fuel-cell.png',
351351
{ 1, 0, 1, 1 }, 0.75
352352
),
353353
icon_size = 64,
354354
icon_mipmamps = 4,
355355
category = 'chemistry',
356356
enabled = false,
357357
ingredients = {
358-
{ type = 'item', name = 'used-up-breeder-fuel-cell', amount = 1 },
359-
{ type = 'fluid', name = 'sulfuric-acid', amount = 125 },
360-
{ type = 'item', name = 'barrel', amount = 5 }
358+
{ type = 'item', name = 'depleted-breeder-fuel-cell', amount = 1 },
359+
{ type = 'fluid', name = 'sulfuric-acid', amount = 125 },
360+
{ type = 'item', name = 'barrel', amount = 5 }
361361
},
362362
energy_required = 2.5,
363363
results = {
364-
{ type = 'item', name = 'used-up-breeder-fuel-cell-solution-barrel', amount = 5 }
364+
{ type = 'item', name = 'breeder-fuel-cell-waste-solution-barrel', amount = 5 }
365365
},
366366
order = 'r[uranium-processing]-c[reprocessing]-d[breeder]-b[with-barreling]',
367367
subgroup = 'nuclear-breeding',
@@ -377,13 +377,13 @@ data:extend({
377377
},
378378
{
379379
type = 'recipe',
380-
name = 'used-up-breeder-fuel-cell-solution-centrifuging',
381-
icon = '__PlutoniumEnergy__/graphics/icons/used-up-breeder-fuel-cell-solution-centrifuging.png',
380+
name = 'breeder-fuel-cell-waste-solution-centrifuging',
381+
icon = '__PlutoniumEnergy__/graphics/icons/breeder-fuel-cell-waste-solution-centrifuging.png',
382382
icon_size = 64,
383383
category = 'centrifuging',
384384
enabled = false,
385385
ingredients = {
386-
{ type = 'item', name = 'used-up-breeder-fuel-cell-solution-barrel', amount = 10 }
386+
{ type = 'item', name = 'breeder-fuel-cell-waste-solution-barrel', amount = 10 }
387387
},
388388
energy_required = 40,
389389
results = {

‎prototypes/technology/technology.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ data:extend({
1818
},
1919
{
2020
type = 'unlock-recipe',
21-
recipe = 'used-up-uranium-fuel-cell-solution-centrifuging'
21+
recipe = 'uranium-fuel-cell-waste-solution-centrifuging'
2222
}
2323
},
2424
prerequisites = { "uranium-processing", "nuclear-fuel-reprocessing", "fluid-handling" },
@@ -142,7 +142,7 @@ data:extend({
142142
},
143143
{
144144
type = 'unlock-recipe',
145-
recipe = 'used-up-breeder-fuel-cell-solution-centrifuging'
145+
recipe = 'breeder-fuel-cell-waste-solution-centrifuging'
146146
},
147147
{
148148
type = 'unlock-recipe',

0 commit comments

Comments
 (0)