Skip to content

Commit c0ebbae

Browse files
QatavinKiwiHawk
Qatavin
and
KiwiHawk
authored
Bobelectronics2.0 (#225)
* Technology name change * New migration for version 1.3 Changes tech advanced-electronics-3 to advanced-processing-unit. * Add new localizations, change electronics techs to match item names from this mod * Add new bob-electronics tech Because vanilla electronics has been moved to the very top of the tech tree, this new tech fixes issues with circular tech prereqs and places the full yellow electronics board at a more appropriate stage on the tech tree * basic-circuit-board enabled = false This recipe is now unlocked by the vanilla electronics tech, which doesn't need any science packs * Remove reference to rocket control unit * Update technology-updates.lua advanced-electronics-3 -> advanced-processing-unit. Add bob-electronics to prereqs where needed. * Update technology-updates.lua * Add new item sounds * Add new item sounds * Fix item sounds added to recipe instead of item * Minor locale fixes - Avoid repeating translations - Define recipe name in prototype rather than locale file * Fixing missing recipe names --------- Co-authored-by: KiwiHawk <59639+KiwiHawk@users.noreply.github.com>
1 parent 40835d2 commit c0ebbae

File tree

10 files changed

+290
-52
lines changed

10 files changed

+290
-52
lines changed

‎bobelectronics/data-updates.lua‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ require("prototypes.recipe-updates")
22
require("prototypes.technology-updates")
33

44
data.raw.recipe["copper-cable"].category = "electronics"
5-
data.raw.recipe["rocket-control-unit"].category = "electronics"
65

76
if data.raw["recipe-category"]["chemical-furnace"] then
87
if data.raw.recipe["carbon"] then

‎bobelectronics/locale/en/bobelectronics.cfg‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ multi-layer-circuit-board=Multi-layer circuit board
2828
electronic-circuit=Basic electronic board
2929
advanced-circuit=Electronic circuit board
3030
processing-unit=Electronic logic board
31-
advanced-processing-unit=Electronic Processing board
31+
advanced-processing-unit=Electronic processing board
3232

3333

3434
[fluid-name]
@@ -51,4 +51,9 @@ bob-fluid-products=Bob's Fluids
5151
bobmods-colorupdate=Color updates
5252
5353
[technology-name]
54+
advanced-circuit=__ITEM__advanced-circuit__
55+
advanced-processing-unit=__ITEM__advanced-processing-unit__
56+
bob-electronics=Electronics
5457
bob-wood-processing=Wood processing
58+
electronics=Basic electronics
59+
processing-unit=__ITEM__processing-unit__

‎bobelectronics/locale/ru/bobelectronics.cfg‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,7 @@ bob-fluid-products=Жидкости Боба
5151
bobmods-colorupdate=Обновлённые цвета
5252

5353
[technology-name]
54+
advanced-circuit=__ITEM__advanced-circuit__
55+
advanced-processing-unit=__ITEM__advanced-processing-unit__
5456
bob-wood-processing=Обработка древесины
57+
processing-unit=__ITEM__processing-unit__

‎bobelectronics/migrations/bobelectronics_0.15.0.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ for index, force in pairs(game.forces) do
5959
force.recipes["processing-unit"].enabled = true
6060
end
6161

62-
if force.technologies["advanced-electronics-3"].researched then
62+
if force.technologies["advanced-processing-unit"].researched then
6363
if force.recipes["gilded-copper-cable"] then
6464
force.recipes["gilded-copper-cable"].enabled = true
6565
end

‎bobelectronics/migrations/bobelectronics_1.3.0.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"technology":
3+
[
4+
["advanced-electronics-3", "advanced-processing-unit"]
5+
]
6+
}

‎bobelectronics/prototypes/chemicals.lua‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ data:extend({
5858
results = {
5959
{ type = "fluid", name = "heavy-oil", amount = 12 },
6060
},
61-
main_product = "", -- Causes it to use the recipe name.
6261
crafting_machine_tint = {
6362
primary = { r = 0.0, g = 0.34, b = 0.5, a = 0.000 },
6463
secondary = { r = 0.1, g = 0.1, b = 0.1, a = 0.000 },

‎bobelectronics/prototypes/electronics.lua‎

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,23 @@
1+
local electronic_part_drop_move = {
2+
filename = "__base__/sound/item/wire-inventory-move.ogg",
3+
volume = 0.8
4+
}
5+
local electronic_part_pick = {
6+
filename = "__base__/sound/item/wire-inventory-pickup.ogg",
7+
volume = 0.6
8+
}
9+
10+
local electronic_board_drop_move = {
11+
filename = "__base__/sound/item/electric-small-inventory-move.ogg",
12+
volume = 1
13+
}
14+
local electronic_board_pick = {
15+
filename = "__base__/sound/item/electric-small-inventory-pickup.ogg",
16+
volume = 0.7
17+
}
18+
119
if data.raw.item["tin-plate"] then
20+
221
data:extend({
322
{
423
type = "item",
@@ -8,6 +27,9 @@ if data.raw.item["tin-plate"] then
827
subgroup = "bob-electronic-components",
928
order = "0-a1[tinned-copper-cable]",
1029
stack_size = 200,
30+
drop_sound = electronic_part_drop_move,
31+
inventory_move_sound = electronic_part_drop_move,
32+
pick_sound = electronic_part_pick,
1133
},
1234

1335
{
@@ -35,6 +57,9 @@ data:extend({
3557
subgroup = "bob-electronic-components",
3658
order = "0-a2[insulated-cable]",
3759
stack_size = 200,
60+
drop_sound = electronic_part_drop_move,
61+
inventory_move_sound = electronic_part_drop_move,
62+
pick_sound = electronic_part_pick,
3863
},
3964

4065
{
@@ -62,6 +87,9 @@ if data.raw.item["gold-plate"] then
6287
subgroup = "bob-electronic-components",
6388
order = "0-a3[gilded-copper-cable]",
6489
stack_size = 200,
90+
drop_sound = electronic_part_drop_move,
91+
inventory_move_sound = electronic_part_drop_move,
92+
pick_sound = electronic_part_pick,
6593
},
6694

6795
{
@@ -90,6 +118,9 @@ if data.raw.item["solder-alloy"] then
90118
subgroup = "bob-electronic-components",
91119
order = "0-a4[solder]",
92120
stack_size = 200,
121+
drop_sound = electronic_part_drop_move,
122+
inventory_move_sound = electronic_part_drop_move,
123+
pick_sound = electronic_part_pick,
93124
},
94125

95126
{
@@ -118,6 +149,9 @@ data:extend({
118149
subgroup = "bob-electronic-components",
119150
order = "0-b1[basic-electronic-components]",
120151
stack_size = 200,
152+
drop_sound = electronic_part_drop_move,
153+
inventory_move_sound = electronic_part_drop_move,
154+
pick_sound = electronic_part_pick,
121155
},
122156

123157
{
@@ -144,6 +178,9 @@ data:extend({
144178
subgroup = "bob-electronic-components",
145179
order = "0-b2[electronic-components]",
146180
stack_size = 200,
181+
drop_sound = electronic_part_drop_move,
182+
inventory_move_sound = electronic_part_drop_move,
183+
pick_sound = electronic_part_pick,
147184
},
148185

149186
{
@@ -171,6 +208,9 @@ data:extend({
171208
subgroup = "bob-electronic-components",
172209
order = "0-b3[integrated-electronics]",
173210
stack_size = 200,
211+
drop_sound = electronic_part_drop_move,
212+
inventory_move_sound = electronic_part_drop_move,
213+
pick_sound = electronic_part_pick,
174214
},
175215

176216
{
@@ -199,6 +239,9 @@ data:extend({
199239
subgroup = "bob-electronic-components",
200240
order = "0-b4[cpu]",
201241
stack_size = 200,
242+
drop_sound = electronic_part_drop_move,
243+
inventory_move_sound = electronic_part_drop_move,
244+
pick_sound = electronic_part_pick,
202245
},
203246

204247
{
@@ -227,6 +270,18 @@ data:extend({
227270
subgroup = "bob-boards",
228271
order = "c-a1[wooden-board]",
229272
stack_size = 200,
273+
drop_sound = {
274+
filename = "__base__/sound/item/wood-inventory-move.ogg",
275+
volume = 0.7
276+
},
277+
inventory_move_sound = {
278+
filename = "__base__/sound/item/wood-inventory-move.ogg",
279+
volume = 0.7
280+
},
281+
pick_sound = {
282+
filename = "__base__/sound/item/wood-inventory-pickup.ogg",
283+
volume = 0.8
284+
},
230285
},
231286

232287
{
@@ -250,6 +305,18 @@ data:extend({
250305
subgroup = "bob-boards",
251306
order = "c-a2[phenolic-board]",
252307
stack_size = 200,
308+
drop_sound = {
309+
filename = "__base__/sound/item/solid-fuel-inventory-move.ogg",
310+
volume = 0.7
311+
},
312+
inventory_move_sound = {
313+
filename = "__base__/sound/item/solid-fuel-inventory-move.ogg",
314+
volume = 0.7
315+
},
316+
pick_sound = {
317+
filename = "__base__/sound/item/solid-fuel-inventory-pickup.ogg",
318+
volume = 0.7
319+
},
253320
},
254321

255322
{
@@ -275,6 +342,18 @@ data:extend({
275342
subgroup = "bob-boards",
276343
order = "c-a3[fibreglass-board]",
277344
stack_size = 200,
345+
drop_sound = {
346+
filename = "__base__/sound/item/solid-fuel-inventory-move.ogg",
347+
volume = 0.7
348+
},
349+
inventory_move_sound = {
350+
filename = "__base__/sound/item/solid-fuel-inventory-move.ogg",
351+
volume = 0.7
352+
},
353+
pick_sound = {
354+
filename = "__base__/sound/item/solid-fuel-inventory-pickup.ogg",
355+
volume = 0.7
356+
},
278357
},
279358

280359
{
@@ -299,12 +378,25 @@ data:extend({
299378
subgroup = "bob-electronic-boards",
300379
order = "c-b1[basic-circuit-board]",
301380
stack_size = 200,
381+
drop_sound = {
382+
filename = "__base__/sound/item/wood-inventory-move.ogg",
383+
volume = 0.7
384+
},
385+
inventory_move_sound = {
386+
filename = "__base__/sound/item/wood-inventory-move.ogg",
387+
volume = 0.7
388+
},
389+
pick_sound = {
390+
filename = "__base__/sound/item/wood-inventory-pickup.ogg",
391+
volume = 0.8
392+
},
302393
},
303394

304395
{
305396
type = "recipe",
306397
name = "basic-circuit-board",
307398
category = "electronics",
399+
enabled = false,
308400
energy_required = 1,
309401
ingredients = {
310402
{ type = "item", name = "wooden-board", amount = 1 },
@@ -325,6 +417,18 @@ data:extend({
325417
subgroup = "bob-electronic-boards",
326418
order = "c-b2[circuit-board]",
327419
stack_size = 200,
420+
drop_sound = {
421+
filename = "__base__/sound/item/planner-inventory-move.ogg",
422+
volume = 0.7
423+
},
424+
inventory_move_sound = {
425+
filename = "__base__/sound/item/planner-inventory-move.ogg",
426+
volume = 0.7
427+
},
428+
pick_sound = {
429+
filename = "__base__/sound/item/planner-inventory-pickup.ogg",
430+
volume = 0.7
431+
},
328432
},
329433

330434
{
@@ -353,6 +457,18 @@ data:extend({
353457
subgroup = "bob-electronic-boards",
354458
order = "c-b3[superior-circuit-board]",
355459
stack_size = 200,
460+
drop_sound = {
461+
filename = "__base__/sound/item/planner-inventory-move.ogg",
462+
volume = 0.7
463+
},
464+
inventory_move_sound = {
465+
filename = "__base__/sound/item/planner-inventory-move.ogg",
466+
volume = 0.7
467+
},
468+
pick_sound = {
469+
filename = "__base__/sound/item/planner-inventory-pickup.ogg",
470+
volume = 0.7
471+
},
356472
},
357473

358474
{
@@ -381,6 +497,18 @@ data:extend({
381497
subgroup = "bob-electronic-boards",
382498
order = "c-b4[multi-layer-circuit-board]",
383499
stack_size = 200,
500+
drop_sound = {
501+
filename = "__base__/sound/item/planner-inventory-move.ogg",
502+
volume = 0.7
503+
},
504+
inventory_move_sound = {
505+
filename = "__base__/sound/item/planner-inventory-move.ogg",
506+
volume = 0.7
507+
},
508+
pick_sound = {
509+
filename = "__base__/sound/item/planner-inventory-pickup.ogg",
510+
volume = 0.7
511+
},
384512
},
385513

386514
{
@@ -409,6 +537,9 @@ data:extend({
409537
subgroup = "bob-electronic-boards",
410538
order = "c-c1[basic-electronic-circuit-board]",
411539
stack_size = 200,
540+
drop_sound = electronic_board_drop_move,
541+
inventory_move_sound = electronic_board_drop_move,
542+
pick_sound = electronic_board_pick,
412543
},
413544

414545
{
@@ -435,6 +566,9 @@ data:extend({
435566
subgroup = "bob-electronic-boards",
436567
order = "c-c2[electronic-circuit-board]",
437568
stack_size = 200,
569+
drop_sound = electronic_board_drop_move,
570+
inventory_move_sound = electronic_board_drop_move,
571+
pick_sound = electronic_board_pick,
438572
},
439573

440574
{
@@ -462,6 +596,9 @@ data:extend({
462596
subgroup = "bob-electronic-boards",
463597
order = "c-c3[electronic-logic-board]",
464598
stack_size = 200,
599+
drop_sound = electronic_board_drop_move,
600+
inventory_move_sound = electronic_board_drop_move,
601+
pick_sound = electronic_board_pick,
465602
},
466603

467604
{
@@ -490,6 +627,9 @@ data:extend({
490627
subgroup = "bob-electronic-boards",
491628
order = "c-c4[electronic-processing-board]",
492629
stack_size = 200,
630+
drop_sound = electronic_board_drop_move,
631+
inventory_move_sound = electronic_board_drop_move,
632+
pick_sound = electronic_board_pick,
493633
},
494634

495635
{

0 commit comments

Comments
 (0)