From bb893a6e4288d3a47c080c81e6038a9d613e3351 Mon Sep 17 00:00:00 2001 From: Qatavin <108201496+Qatavin@users.noreply.github.com> Date: Sun, 28 Jul 2024 23:00:44 -0700 Subject: [PATCH 1/7] New lead oxide graphics (#191) * Upload new lead oxide graphics Includes mipmaps and increases size from 32x to 64x. * Update chemicals.lua with new lead oxide Adjusts prototype for lead oxide to use new graphics. * chemistry-recipe.lua: new lead oxide graphics * chemistry-recipe.lua: new lead oxide graphics * Updating version number and changelog --------- Co-authored-by: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> --- bobplates/changelog.txt | 5 +++++ bobplates/graphics/icons/lead-oxide.png | Bin 2313 -> 11732 bytes bobplates/info.json | 2 +- bobplates/prototypes/item/chemicals.lua | 3 ++- .../prototypes/recipe/chemistry-recipe.lua | 6 ++++-- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/bobplates/changelog.txt b/bobplates/changelog.txt index b5fba4e96..c62d06687 100644 --- a/bobplates/changelog.txt +++ b/bobplates/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 1.3.0 +Date: ??? + Changes: + - New lead oxide graphics #191 +--------------------------------------------------------------------------------------------------- Version: 1.2.1 Date: 21. 02. 2024 Bugfixes: diff --git a/bobplates/graphics/icons/lead-oxide.png b/bobplates/graphics/icons/lead-oxide.png index 1794ffadb9f66e003f69bdb31bff8c103b83c2fa..fca6a431b53fa1762886b3d25932cd6afcd773cb 100644 GIT binary patch literal 11732 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Ν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 diff --git a/bobplates/info.json b/bobplates/info.json index 406be718d..6bbb686a0 100644 --- a/bobplates/info.json +++ b/bobplates/info.json @@ -1,6 +1,6 @@ { "name": "bobplates", - "version": "1.2.1", + "version": "1.3.0", "factorio_version": "1.1", "title": "Bob's Metals, Chemicals and Intermediates mod", "author": "Bobingabout", diff --git a/bobplates/prototypes/item/chemicals.lua b/bobplates/prototypes/item/chemicals.lua index 4b0f2cc76..dea15acbf 100644 --- a/bobplates/prototypes/item/chemicals.lua +++ b/bobplates/prototypes/item/chemicals.lua @@ -253,7 +253,8 @@ data:extend({ type = "item", name = "lead-oxide", icon = "__bobplates__/graphics/icons/lead-oxide.png", - icon_size = 32, + icon_size = 64, + icon_mipmaps = 4, subgroup = "bob-resource-chemical", order = "f[lead-oxide]", stack_size = 100, diff --git a/bobplates/prototypes/recipe/chemistry-recipe.lua b/bobplates/prototypes/recipe/chemistry-recipe.lua index 0336cc972..6b4428a79 100644 --- a/bobplates/prototypes/recipe/chemistry-recipe.lua +++ b/bobplates/prototypes/recipe/chemistry-recipe.lua @@ -571,7 +571,8 @@ data:extend({ type = "recipe", name = "lead-oxide", icon = "__bobplates__/graphics/icons/lead-oxide.png", - icon_size = 32, + icon_size = 64, + icon_mipmaps = 4, subgroup = "bob-resource-chemical", order = "f[lead-oxide]", category = "chemistry", @@ -742,7 +743,8 @@ data:extend({ type = "recipe", name = "lead-oxide-2", icon = "__bobplates__/graphics/icons/lead-oxide.png", - icon_size = 32, + icon_size = 64, + icon_mipmaps = 4, subgroup = "bob-resource-chemical", order = "f[lead-oxide]", category = "chemistry", From 412703f8541c872b228d2445423d4f70b0d5506b Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Mon, 12 Aug 2024 19:28:47 +1200 Subject: [PATCH 2/7] Add mod check for DiscoScience Prevents errors with undeclared variables check --- bobmodules/prototypes/lab.lua | 2 +- bobtech/prototypes/entity/entity.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bobmodules/prototypes/lab.lua b/bobmodules/prototypes/lab.lua index 7e34d65e6..96de6a04e 100644 --- a/bobmodules/prototypes/lab.lua +++ b/bobmodules/prototypes/lab.lua @@ -191,7 +191,7 @@ if bobmods.modules.ModulesLab then }) bobmods.lib.tech.add_recipe_unlock("modules", "lab-module") - if DiscoScience and DiscoScience.prepareLab then + if mods["DiscoScience"] and DiscoScience and DiscoScience.prepareLab then DiscoScience.prepareLab(data.raw["lab"]["lab-module"]) end end diff --git a/bobtech/prototypes/entity/entity.lua b/bobtech/prototypes/entity/entity.lua index 4dedd4e26..76d19f667 100644 --- a/bobtech/prototypes/entity/entity.lua +++ b/bobtech/prototypes/entity/entity.lua @@ -328,7 +328,7 @@ if settings.startup["bobmods-burnerphase"].value == true then }, }) - if DiscoScience and DiscoScience.prepareLab then + if mods["DiscoScience"] and DiscoScience and DiscoScience.prepareLab then DiscoScience.prepareLab(data.raw["lab"]["burner-lab"]) end end From 69ff77d03f4d60d973a0bdccdc5fa5255a05fea8 Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Wed, 4 Sep 2024 19:17:04 +1200 Subject: [PATCH 3/7] Missing Localisations #195 --- bobenemies/changelog.txt | 5 +++++ bobenemies/info.json | 2 +- bobenemies/prototypes/entities.lua | 1 + bobwarfare/changelog.txt | 2 ++ bobwarfare/prototypes/entity/effects.lua | 2 ++ 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/bobenemies/changelog.txt b/bobenemies/changelog.txt index c7e92f9d7..bfcb9a758 100644 --- a/bobenemies/changelog.txt +++ b/bobenemies/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 1.3.0 +Date: ??? + Bugfixes: + - Fixed missing poison cloud localisation #195 +--------------------------------------------------------------------------------------------------- Version: 1.2.0 Date: 22. 12. 2023 Bugfixes: diff --git a/bobenemies/info.json b/bobenemies/info.json index 30521bac1..f2a03f8ad 100644 --- a/bobenemies/info.json +++ b/bobenemies/info.json @@ -1,6 +1,6 @@ { "name": "bobenemies", - "version": "1.2.0", + "version": "1.3.0", "factorio_version": "1.1", "title": "Bob's Enemies mod", "author": "Bobingabout", diff --git a/bobenemies/prototypes/entities.lua b/bobenemies/prototypes/entities.lua index 9dce55104..1397e1809 100644 --- a/bobenemies/prototypes/entities.lua +++ b/bobenemies/prototypes/entities.lua @@ -2,6 +2,7 @@ data:extend({ { type = "smoke-with-trigger", name = "small-poison-cloud", + localised_name = { "entity-name.poison-cloud" }, flags = { "not-on-map" }, show_when_smoke_off = true, animation = { diff --git a/bobwarfare/changelog.txt b/bobwarfare/changelog.txt index 6193a6b09..b6b983750 100644 --- a/bobwarfare/changelog.txt +++ b/bobwarfare/changelog.txt @@ -1,6 +1,8 @@ --------------------------------------------------------------------------------------------------- Version: 1.3.0 Date: ??? + Bugfixes: + - Fixed missing poison cloud localisation #195 Changes: - Spread out the armor techs more evenly between tech tiers #180 - Changed combat robot and mech brains to use circuits rather than circuit components #184 diff --git a/bobwarfare/prototypes/entity/effects.lua b/bobwarfare/prototypes/entity/effects.lua index 6b79305c5..932d87760 100644 --- a/bobwarfare/prototypes/entity/effects.lua +++ b/bobwarfare/prototypes/entity/effects.lua @@ -18,6 +18,7 @@ data:extend({ { type = "smoke-with-trigger", name = "small-poison-cloud", + localised_name = { "entity-name.poison-cloud" }, flags = { "not-on-map" }, show_when_smoke_off = true, animation = { @@ -89,6 +90,7 @@ data:extend({ { type = "smoke-with-trigger", name = "poison-artillery-cloud", + localised_name = { "entity-name.poison-cloud" }, flags = { "not-on-map" }, show_when_smoke_off = true, particle_count = 16, From cabf49e0791a5cbd9df41446c511157cebe67aac Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Sat, 7 Sep 2024 22:21:42 +1200 Subject: [PATCH 4/7] Fixed antenna array recipe speed Changed from 0.2 to 2 --- boblogistics/prototypes/recipe/roboport-parts-recipe.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/boblogistics/prototypes/recipe/roboport-parts-recipe.lua b/boblogistics/prototypes/recipe/roboport-parts-recipe.lua index 31b133e83..9e53c16ca 100644 --- a/boblogistics/prototypes/recipe/roboport-parts-recipe.lua +++ b/boblogistics/prototypes/recipe/roboport-parts-recipe.lua @@ -9,7 +9,7 @@ data:extend({ { "electronic-circuit", 5 }, }, result = "roboport-antenna-1", - energy_required = 0.2, + energy_required = 2, }, { type = "recipe", @@ -21,7 +21,7 @@ data:extend({ { "advanced-circuit", 5 }, }, result = "roboport-antenna-2", - energy_required = 0.2, + energy_required = 2, }, { type = "recipe", @@ -33,7 +33,7 @@ data:extend({ { "processing-unit", 5 }, }, result = "roboport-antenna-3", - energy_required = 0.2, + energy_required = 2, }, { type = "recipe", @@ -46,7 +46,7 @@ data:extend({ { "processing-unit", 5 }, }, result = "roboport-antenna-4", - energy_required = 0.2, + energy_required = 2, }, }) From ff0df405e63320381f364110d0f962d2d61bf3a6 Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Sat, 7 Sep 2024 23:58:55 +1200 Subject: [PATCH 5/7] Remove Modules Lab #196 --- bobmodules/changelog.txt | 5 + bobmodules/data.lua | 6 - bobmodules/info.json | 2 +- bobmodules/locale/en/bobmodules.cfg | 5 - bobmodules/prototypes/item/electronics.lua | 206 ++++------- bobmodules/prototypes/lab.lua | 197 ---------- .../prototypes/recipe/electronics-updates.lua | 18 +- .../prototypes/technology/module-merged.lua | 329 ++--------------- bobmodules/prototypes/technology/module.lua | 346 +++--------------- bobmodules/settings-updates.lua | 3 - bobmodules/settings.lua | 6 - 11 files changed, 151 insertions(+), 972 deletions(-) delete mode 100644 bobmodules/prototypes/lab.lua diff --git a/bobmodules/changelog.txt b/bobmodules/changelog.txt index 30e4bb809..e411d485e 100644 --- a/bobmodules/changelog.txt +++ b/bobmodules/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 1.3.0 +Date: ??? + Changes: + - Removed Modules Lab #196 +--------------------------------------------------------------------------------------------------- Version: 1.2.0 Date: 22. 12. 2023 Changes: diff --git a/bobmodules/data.lua b/bobmodules/data.lua index 008607c8d..11e6ad0e1 100644 --- a/bobmodules/data.lua +++ b/bobmodules/data.lua @@ -5,11 +5,6 @@ if not bobmods.modules then bobmods.modules = {} end -bobmods.modules.ModulesLab = settings.startup["bobmods-modules-enable-modules-lab"].value -if mods["IndustrialRevolution"] then - bobmods.modules.ModulesLab = false -end - bobmods.modules.SpeedPerLevel = settings.startup["bobmods-modules-perlevel-bonus-speed"].value bobmods.modules.PollutionPerLevel = settings.startup["bobmods-modules-perlevel-bonus-pollution"].value bobmods.modules.ConsumptionPerLevel = settings.startup["bobmods-modules-perlevel-bonus-consumption"].value @@ -29,7 +24,6 @@ bobmods.modules.PollutionPenalty = settings.startup["bobmods-modules-start-penal bobmods.modules.ConsumptionPenalty = settings.startup["bobmods-modules-start-penalty-consumption"].value require("prototypes.category") -require("prototypes.lab") require("prototypes.beacon") require("prototypes.item.module") diff --git a/bobmodules/info.json b/bobmodules/info.json index 4f98645ea..839363766 100644 --- a/bobmodules/info.json +++ b/bobmodules/info.json @@ -1,6 +1,6 @@ { "name": "bobmodules", - "version": "1.2.0", + "version": "1.3.0", "factorio_version": "1.1", "title": "Bob's Modules mod", "author": "Bobingabout", diff --git a/bobmodules/locale/en/bobmodules.cfg b/bobmodules/locale/en/bobmodules.cfg index ce8b453a8..9ff335db6 100644 --- a/bobmodules/locale/en/bobmodules.cfg +++ b/bobmodules/locale/en/bobmodules.cfg @@ -80,8 +80,6 @@ god-module-5=God module 5 beacon-2=Beacon 2 beacon-3=Beacon 3 -lab-module=Modules lab - module-case=Module case module-contact=Module contact module-circuit-board=Module main board @@ -123,7 +121,6 @@ module-merging=Module effect combining beacon-2=Beacon 2 beacon-3=Beacon 3 -lab-module=Modules lab [item-group-name] @@ -138,7 +135,6 @@ bobmods-modules-enablegodmodules=God modules bobmods-modules-enableproductivitylimitation=Productivity limitations bobmods-modules-productivityhasspeed=Speed on Productivity modules bobmods-modules-transmitproductivity=Transmit productivity -bobmods-modules-enable-modules-lab=Modules lab bobmods-modules-perlevel-bonus-speed=Module speed bonus per tier bobmods-modules-perlevel-bonus-pollution=Module pollution bonus per tier @@ -167,4 +163,3 @@ bobmods-modules-enablegodmodules=If enabled, then God modules and research will bobmods-modules-enableproductivitylimitation=If enabled, modules that effect productivity can only be used on Registered intermediates. Warning: The game will delete any modules that do not match the limits bobmods-modules-productivityhasspeed=If enabled, Productivity modules suffer speed penalty. Raw productivity modules also cost Speed circuits. bobmods-modules-transmitproductivity=If enabled, the Beacons can transmit the productivity effect. -bobmods-modules-enable-modules-lab=If enabled, module techs will be researched in a dedicated lab and require module components instead of science packs. diff --git a/bobmodules/prototypes/item/electronics.lua b/bobmodules/prototypes/item/electronics.lua index a4b579c70..42987960d 100644 --- a/bobmodules/prototypes/item/electronics.lua +++ b/bobmodules/prototypes/item/electronics.lua @@ -1,143 +1,69 @@ -if bobmods.modules.ModulesLab then - data:extend({ - { - type = "tool", - name = "module-case", - icon = "__bobmodules__/graphics/icons/module-case.png", - icon_size = 32, - subgroup = "module-intermediates", - order = "c-0[module-case]", - stack_size = 100, - durability = 1, - }, - { - type = "tool", - name = "module-circuit-board", - icon = "__bobmodules__/graphics/icons/module-circuit-board.png", - icon_size = 32, - subgroup = "module-intermediates", - order = "c-b4[module-circuit-board]", - stack_size = 200, - durability = 1, - }, - { - type = "tool", - name = "speed-processor", - icon = "__bobmodules__/graphics/icons/speed-processor.png", - icon_size = 32, - subgroup = "module-intermediates", - order = "c-c4[speed-processor-1]", - stack_size = 100, - durability = 1, - }, - { - type = "tool", - name = "effectivity-processor", - icon = "__bobmodules__/graphics/icons/effectivity-processor.png", - icon_size = 32, - subgroup = "module-intermediates", - order = "c-c5[effectivity-processor-1]", - stack_size = 100, - durability = 1, - }, - { - type = "tool", - name = "productivity-processor", - icon = "__bobmodules__/graphics/icons/productivity-processor.png", - icon_size = 32, - subgroup = "module-intermediates", - order = "c-c6[productivity-processor-1]", - stack_size = 100, - durability = 1, - }, - { - type = "tool", - name = "pollution-clean-processor", - icon = "__bobmodules__/graphics/icons/pollution-clean-processor.png", - icon_size = 32, - subgroup = "module-intermediates", - order = "c-c7[pollution-clean-processor-1]", - stack_size = 100, - durability = 1, - }, - { - type = "tool", - name = "pollution-create-processor", - icon = "__bobmodules__/graphics/icons/pollution-create-processor.png", - icon_size = 32, - subgroup = "module-intermediates", - order = "c-c8[pollution-create-processor-1]", - stack_size = 100, - durability = 1, - }, - }) -else - data:extend({ - { - type = "item", - name = "module-case", - icon = "__bobmodules__/graphics/icons/module-case.png", - icon_size = 32, - subgroup = "module-intermediates", - order = "c-0[module-case]", - stack_size = 100, - }, - { - type = "item", - name = "module-circuit-board", - icon = "__bobmodules__/graphics/icons/module-circuit-board.png", - icon_size = 32, - subgroup = "module-intermediates", - order = "c-b4[module-circuit-board]", - stack_size = 200, - }, - { - type = "item", - name = "speed-processor", - icon = "__bobmodules__/graphics/icons/speed-processor.png", - icon_size = 32, - subgroup = "module-intermediates", - order = "c-c4[speed-processor-1]", - stack_size = 100, - }, - { - type = "item", - name = "effectivity-processor", - icon = "__bobmodules__/graphics/icons/effectivity-processor.png", - icon_size = 32, - subgroup = "module-intermediates", - order = "c-c5[effectivity-processor-1]", - stack_size = 100, - }, - { - type = "item", - name = "productivity-processor", - icon = "__bobmodules__/graphics/icons/productivity-processor.png", - icon_size = 32, - subgroup = "module-intermediates", - order = "c-c6[productivity-processor-1]", - stack_size = 100, - }, - { - type = "item", - name = "pollution-clean-processor", - icon = "__bobmodules__/graphics/icons/pollution-clean-processor.png", - icon_size = 32, - subgroup = "module-intermediates", - order = "c-c7[pollution-clean-processor-1]", - stack_size = 100, - }, - { - type = "item", - name = "pollution-create-processor", - icon = "__bobmodules__/graphics/icons/pollution-create-processor.png", - icon_size = 32, - subgroup = "module-intermediates", - order = "c-c8[pollution-create-processor-1]", - stack_size = 100, - }, - }) -end +data:extend({ + { + type = "item", + name = "module-case", + icon = "__bobmodules__/graphics/icons/module-case.png", + icon_size = 32, + subgroup = "module-intermediates", + order = "c-0[module-case]", + stack_size = 100, + }, + { + type = "item", + name = "module-circuit-board", + icon = "__bobmodules__/graphics/icons/module-circuit-board.png", + icon_size = 32, + subgroup = "module-intermediates", + order = "c-b4[module-circuit-board]", + stack_size = 200, + }, + { + type = "item", + name = "speed-processor", + icon = "__bobmodules__/graphics/icons/speed-processor.png", + icon_size = 32, + subgroup = "module-intermediates", + order = "c-c4[speed-processor-1]", + stack_size = 100, + }, + { + type = "item", + name = "effectivity-processor", + icon = "__bobmodules__/graphics/icons/effectivity-processor.png", + icon_size = 32, + subgroup = "module-intermediates", + order = "c-c5[effectivity-processor-1]", + stack_size = 100, + }, + { + type = "item", + name = "productivity-processor", + icon = "__bobmodules__/graphics/icons/productivity-processor.png", + icon_size = 32, + subgroup = "module-intermediates", + order = "c-c6[productivity-processor-1]", + stack_size = 100, + }, + { + type = "item", + name = "pollution-clean-processor", + icon = "__bobmodules__/graphics/icons/pollution-clean-processor.png", + icon_size = 32, + subgroup = "module-intermediates", + order = "c-c7[pollution-clean-processor-1]", + stack_size = 100, + }, + { + type = "item", + name = "pollution-create-processor", + icon = "__bobmodules__/graphics/icons/pollution-create-processor.png", + icon_size = 32, + subgroup = "module-intermediates", + order = "c-c8[pollution-create-processor-1]", + stack_size = 100, + }, +}) + data:extend({ { diff --git a/bobmodules/prototypes/lab.lua b/bobmodules/prototypes/lab.lua deleted file mode 100644 index 96de6a04e..000000000 --- a/bobmodules/prototypes/lab.lua +++ /dev/null @@ -1,197 +0,0 @@ -if bobmods.modules.ModulesLab then - data.raw["lab"]["lab"].fast_replaceable_group = "lab" - - data:extend({ - { - type = "item", - name = "lab-module", - icon = "__base__/graphics/icons/lab.png", - icon_size = 64, - icon_mipmaps = 4, - subgroup = "production-machine", - order = "g[lab]-a[module]", - place_result = "lab-module", - stack_size = 10, - }, - - { - type = "lab", - name = "lab-module", - icon = "__base__/graphics/icons/lab.png", - icon_size = 64, - icon_mipmaps = 4, - flags = { "placeable-player", "player-creation" }, - minable = { mining_time = 1, result = "lab-module" }, - max_health = 200, - corpse = "big-remnants", - collision_box = { { -1.2, -1.2 }, { 1.2, 1.2 } }, - selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } }, - light = { intensity = 0.75, size = 8 }, - on_animation = { - layers = { - { - filename = "__base__/graphics/entity/lab/lab.png", - width = 98, - height = 87, - frame_count = 33, - line_length = 11, - animation_speed = 1 / 3, - shift = util.by_pixel(0, 1.5), - hr_version = { - filename = "__base__/graphics/entity/lab/hr-lab.png", - width = 194, - height = 174, - frame_count = 33, - line_length = 11, - animation_speed = 1 / 3, - shift = util.by_pixel(0, 1.5), - scale = 0.5, - }, - }, - { - filename = "__base__/graphics/entity/lab/lab-integration.png", - width = 122, - height = 81, - frame_count = 1, - line_length = 1, - repeat_count = 33, - animation_speed = 1 / 3, - shift = util.by_pixel(0, 15.5), - hr_version = { - filename = "__base__/graphics/entity/lab/hr-lab-integration.png", - width = 242, - height = 162, - frame_count = 1, - line_length = 1, - repeat_count = 33, - animation_speed = 1 / 3, - shift = util.by_pixel(0, 15.5), - scale = 0.5, - }, - }, - { - filename = "__base__/graphics/entity/lab/lab-shadow.png", - width = 122, - height = 68, - frame_count = 1, - line_length = 1, - repeat_count = 33, - animation_speed = 1 / 3, - shift = util.by_pixel(13, 11), - draw_as_shadow = true, - hr_version = { - filename = "__base__/graphics/entity/lab/hr-lab-shadow.png", - width = 242, - height = 136, - frame_count = 1, - line_length = 1, - repeat_count = 33, - animation_speed = 1 / 3, - shift = util.by_pixel(13, 11), - scale = 0.5, - draw_as_shadow = true, - }, - }, - }, - }, - off_animation = { - layers = { - { - filename = "__base__/graphics/entity/lab/lab.png", - width = 98, - height = 87, - frame_count = 1, - shift = util.by_pixel(0, 1.5), - hr_version = { - filename = "__base__/graphics/entity/lab/hr-lab.png", - width = 194, - height = 174, - frame_count = 1, - shift = util.by_pixel(0, 1.5), - scale = 0.5, - }, - }, - { - filename = "__base__/graphics/entity/lab/lab-integration.png", - width = 122, - height = 81, - frame_count = 1, - shift = util.by_pixel(0, 15.5), - hr_version = { - filename = "__base__/graphics/entity/lab/hr-lab-integration.png", - width = 242, - height = 162, - frame_count = 1, - shift = util.by_pixel(0, 15.5), - scale = 0.5, - }, - }, - { - filename = "__base__/graphics/entity/lab/lab-shadow.png", - width = 122, - height = 68, - frame_count = 1, - shift = util.by_pixel(13, 11), - draw_as_shadow = true, - hr_version = { - filename = "__base__/graphics/entity/lab/hr-lab-shadow.png", - width = 242, - height = 136, - frame_count = 1, - shift = util.by_pixel(13, 11), - draw_as_shadow = true, - scale = 0.5, - }, - }, - }, - }, - energy_source = { - type = "electric", - usage_priority = "secondary-input", - }, - working_sound = { - sound = { - filename = "__base__/sound/lab.ogg", - volume = 0.7, - }, - apparent_volume = 1.5, - }, - energy_usage = "75kW", - inputs = { - "module-case", - "module-circuit-board", - "speed-processor", - "effectivity-processor", - "productivity-processor", - "pollution-clean-processor", - "pollution-create-processor", - }, - researching_speed = 1.5, - module_specification = { - module_slots = 3, - module_info_icon_shift = { 0, 0.5 }, - module_info_multi_row_initial_height_modifier = -0.3, - }, - fast_replaceable_group = "lab", - }, - - { - type = "recipe", - name = "lab-module", - enabled = false, - energy_required = 15, - ingredients = { - { "lab", 1 }, - { "speed-processor", 5 }, - { "effectivity-processor", 5 }, - { "productivity-processor", 5 }, - }, - result = "lab-module", - }, - }) - - bobmods.lib.tech.add_recipe_unlock("modules", "lab-module") - if mods["DiscoScience"] and DiscoScience and DiscoScience.prepareLab then - DiscoScience.prepareLab(data.raw["lab"]["lab-module"]) - end -end diff --git a/bobmodules/prototypes/recipe/electronics-updates.lua b/bobmodules/prototypes/recipe/electronics-updates.lua index 462f98fdd..a546dc2f7 100644 --- a/bobmodules/prototypes/recipe/electronics-updates.lua +++ b/bobmodules/prototypes/recipe/electronics-updates.lua @@ -178,19 +178,11 @@ bobmods.lib.tech.add_recipe_unlock("modules", "module-case") bobmods.lib.tech.add_recipe_unlock("modules", "module-circuit-board") bobmods.lib.tech.add_recipe_unlock("modules", "module-contact") bobmods.lib.tech.add_recipe_unlock("modules", "module-processor-board") -if bobmods.modules.ModulesLab then - bobmods.lib.tech.add_recipe_unlock("modules", "speed-processor") - bobmods.lib.tech.add_recipe_unlock("modules", "effectivity-processor") - bobmods.lib.tech.add_recipe_unlock("modules", "productivity-processor") - bobmods.lib.tech.add_recipe_unlock("modules", "pollution-clean-processor") - bobmods.lib.tech.add_recipe_unlock("modules", "pollution-create-processor") -else - bobmods.lib.tech.add_recipe_unlock("speed-module", "speed-processor") - bobmods.lib.tech.add_recipe_unlock("effectivity-module", "effectivity-processor") - bobmods.lib.tech.add_recipe_unlock("productivity-module", "productivity-processor") - bobmods.lib.tech.add_recipe_unlock("pollution-clean-module-1", "pollution-clean-processor") - bobmods.lib.tech.add_recipe_unlock("pollution-create-module-1", "pollution-create-processor") -end +bobmods.lib.tech.add_recipe_unlock("speed-module", "speed-processor") +bobmods.lib.tech.add_recipe_unlock("effectivity-module", "effectivity-processor") +bobmods.lib.tech.add_recipe_unlock("productivity-module", "productivity-processor") +bobmods.lib.tech.add_recipe_unlock("pollution-clean-module-1", "pollution-clean-processor") +bobmods.lib.tech.add_recipe_unlock("pollution-create-module-1", "pollution-create-processor") bobmods.lib.tech.add_recipe_unlock("advanced-electronics-2", "module-processor-board-2") if data.raw.technology["advanced-electronics-3"] then diff --git a/bobmodules/prototypes/technology/module-merged.lua b/bobmodules/prototypes/technology/module-merged.lua index ee8073557..9985d2210 100644 --- a/bobmodules/prototypes/technology/module-merged.lua +++ b/bobmodules/prototypes/technology/module-merged.lua @@ -13,18 +13,7 @@ then icon_mipmaps = 4, effects = {}, prerequisites = { "modules" }, - unit = bobmods.modules.ModulesLab and { - count = 100, - ingredients = { - { "speed-processor", 1 }, - { "effectivity-processor", 1 }, - { "productivity-processor", 1 }, - { "pollution-clean-processor", 1 }, - { "module-circuit-board", 1 }, - { "module-case", 1 }, - }, - time = 30, - } or { + unit = { count = 100, ingredients = { { "automation-science-pack", 1 }, @@ -55,14 +44,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then }, }, prerequisites = { "module-merging", "speed-module", "effectivity-module" }, - unit = bobmods.modules.ModulesLab and { - count = 25, - ingredients = { - { "speed-processor", 1 }, - { "effectivity-processor", 1 }, - }, - time = 30, - } or { + unit = { count = 50, ingredients = { { "automation-science-pack", 1 }, @@ -88,14 +70,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then }, }, prerequisites = { "raw-speed-module-1", "speed-module-2", "effectivity-module-2" }, - unit = bobmods.modules.ModulesLab and { - count = 50, - ingredients = { - { "speed-processor", 1 }, - { "effectivity-processor", 1 }, - }, - time = 30, - } or { + unit = { count = 100, ingredients = { { "automation-science-pack", 1 }, @@ -121,15 +96,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then }, }, prerequisites = { "raw-speed-module-2", "speed-module-3", "effectivity-module-3" }, - unit = bobmods.modules.ModulesLab and { - count = 50, - ingredients = { - { "speed-processor", 2 }, - { "effectivity-processor", 2 }, - { "module-circuit-board", 1 }, - }, - time = 60, - } or { + unit = { count = 150, ingredients = { { "automation-science-pack", 1 }, @@ -156,15 +123,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then }, }, prerequisites = { "raw-speed-module-3", "speed-module-4", "effectivity-module-4" }, - unit = bobmods.modules.ModulesLab and { - count = 50, - ingredients = { - { "speed-processor", 4 }, - { "effectivity-processor", 4 }, - { "module-circuit-board", 2 }, - }, - time = 60, - } or { + unit = { count = 200, ingredients = { { "automation-science-pack", 1 }, @@ -191,16 +150,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then }, }, prerequisites = { "raw-speed-module-4", "speed-module-5", "effectivity-module-5" }, - unit = bobmods.modules.ModulesLab and { - count = 75, - ingredients = { - { "speed-processor", 4 }, - { "effectivity-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 250, ingredients = { { "automation-science-pack", 1 }, @@ -227,16 +177,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then }, }, prerequisites = { "raw-speed-module-5", "speed-module-6", "effectivity-module-6" }, - unit = bobmods.modules.ModulesLab and { - count = 100, - ingredients = { - { "speed-processor", 4 }, - { "effectivity-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 300, ingredients = { { "automation-science-pack", 1 }, @@ -264,16 +205,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then }, }, prerequisites = { "raw-speed-module-6", "speed-module-7", "effectivity-module-7" }, - unit = bobmods.modules.ModulesLab and { - count = 150, - ingredients = { - { "speed-processor", 4 }, - { "effectivity-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 350, ingredients = { { "automation-science-pack", 1 }, @@ -301,16 +233,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then }, }, prerequisites = { "raw-speed-module-7", "speed-module-8", "effectivity-module-8" }, - unit = bobmods.modules.ModulesLab and { - count = 250, - ingredients = { - { "speed-processor", 4 }, - { "effectivity-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 400, ingredients = { { "automation-science-pack", 1 }, @@ -342,14 +265,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then }, }, prerequisites = { "module-merging", "effectivity-module", "pollution-clean-module-1" }, - unit = bobmods.modules.ModulesLab and { - count = 25, - ingredients = { - { "effectivity-processor", 1 }, - { "pollution-clean-processor", 1 }, - }, - time = 30, - } or { + unit = { count = 50, ingredients = { { "automation-science-pack", 1 }, @@ -375,14 +291,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then }, }, prerequisites = { "green-module-1", "effectivity-module-2", "pollution-clean-module-2" }, - unit = bobmods.modules.ModulesLab and { - count = 50, - ingredients = { - { "effectivity-processor", 1 }, - { "pollution-clean-processor", 1 }, - }, - time = 30, - } or { + unit = { count = 100, ingredients = { { "automation-science-pack", 1 }, @@ -408,15 +317,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then }, }, prerequisites = { "green-module-2", "effectivity-module-3", "pollution-clean-module-3" }, - unit = bobmods.modules.ModulesLab and { - count = 50, - ingredients = { - { "effectivity-processor", 2 }, - { "pollution-clean-processor", 2 }, - { "module-circuit-board", 1 }, - }, - time = 60, - } or { + unit = { count = 150, ingredients = { { "automation-science-pack", 1 }, @@ -443,15 +344,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then }, }, prerequisites = { "green-module-3", "effectivity-module-4", "pollution-clean-module-4" }, - unit = bobmods.modules.ModulesLab and { - count = 50, - ingredients = { - { "effectivity-processor", 4 }, - { "pollution-clean-processor", 4 }, - { "module-circuit-board", 2 }, - }, - time = 60, - } or { + unit = { count = 200, ingredients = { { "automation-science-pack", 1 }, @@ -478,16 +371,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then }, }, prerequisites = { "green-module-4", "effectivity-module-5", "pollution-clean-module-5" }, - unit = bobmods.modules.ModulesLab and { - count = 75, - ingredients = { - { "effectivity-processor", 4 }, - { "pollution-clean-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 250, ingredients = { { "automation-science-pack", 1 }, @@ -514,16 +398,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then }, }, prerequisites = { "green-module-5", "effectivity-module-6", "pollution-clean-module-6" }, - unit = bobmods.modules.ModulesLab and { - count = 100, - ingredients = { - { "effectivity-processor", 4 }, - { "pollution-clean-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 300, ingredients = { { "automation-science-pack", 1 }, @@ -551,16 +426,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then }, }, prerequisites = { "green-module-6", "effectivity-module-7", "pollution-clean-module-7" }, - unit = bobmods.modules.ModulesLab and { - count = 150, - ingredients = { - { "effectivity-processor", 4 }, - { "pollution-clean-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 350, ingredients = { { "automation-science-pack", 1 }, @@ -588,16 +454,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then }, }, prerequisites = { "green-module-7", "effectivity-module-8", "pollution-clean-module-8" }, - unit = bobmods.modules.ModulesLab and { - count = 250, - ingredients = { - { "effectivity-processor", 4 }, - { "pollution-clean-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 400, ingredients = { { "automation-science-pack", 1 }, @@ -630,15 +487,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru }, }, prerequisites = { "module-merging", "productivity-module", "effectivity-module", "pollution-clean-module-1" }, - unit = bobmods.modules.ModulesLab and { - count = 25, - ingredients = { - { "effectivity-processor", 1 }, - { "productivity-processor", 1 }, - { "pollution-clean-processor", 1 }, - }, - time = 30, - } or { + unit = { count = 50, ingredients = { { "automation-science-pack", 1 }, @@ -669,15 +518,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru "effectivity-module-2", "pollution-clean-module-2", }, - unit = bobmods.modules.ModulesLab and { - count = 50, - ingredients = { - { "effectivity-processor", 1 }, - { "productivity-processor", 1 }, - { "pollution-clean-processor", 1 }, - }, - time = 30, - } or { + unit = { count = 100, ingredients = { { "automation-science-pack", 1 }, @@ -708,16 +549,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru "effectivity-module-3", "pollution-clean-module-3", }, - unit = bobmods.modules.ModulesLab and { - count = 50, - ingredients = { - { "effectivity-processor", 2 }, - { "productivity-processor", 2 }, - { "pollution-clean-processor", 2 }, - { "module-circuit-board", 1 }, - }, - time = 60, - } or { + unit = { count = 150, ingredients = { { "automation-science-pack", 1 }, @@ -749,16 +581,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru "effectivity-module-4", "pollution-clean-module-4", }, - unit = bobmods.modules.ModulesLab and { - count = 50, - ingredients = { - { "effectivity-processor", 4 }, - { "productivity-processor", 4 }, - { "pollution-clean-processor", 4 }, - { "module-circuit-board", 2 }, - }, - time = 60, - } or { + unit = { count = 200, ingredients = { { "automation-science-pack", 1 }, @@ -790,17 +613,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru "effectivity-module-5", "pollution-clean-module-5", }, - unit = bobmods.modules.ModulesLab and { - count = 75, - ingredients = { - { "effectivity-processor", 4 }, - { "productivity-processor", 4 }, - { "pollution-clean-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 250, ingredients = { { "automation-science-pack", 1 }, @@ -832,17 +645,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru "effectivity-module-6", "pollution-clean-module-6", }, - unit = bobmods.modules.ModulesLab and { - count = 100, - ingredients = { - { "effectivity-processor", 4 }, - { "productivity-processor", 4 }, - { "pollution-clean-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 300, ingredients = { { "automation-science-pack", 1 }, @@ -875,17 +678,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru "effectivity-module-7", "pollution-clean-module-7", }, - unit = bobmods.modules.ModulesLab and { - count = 150, - ingredients = { - { "effectivity-processor", 4 }, - { "productivity-processor", 4 }, - { "pollution-clean-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 350, ingredients = { { "automation-science-pack", 1 }, @@ -918,17 +711,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru "effectivity-module-8", "pollution-clean-module-8", }, - unit = bobmods.modules.ModulesLab and { - count = 250, - ingredients = { - { "effectivity-processor", 4 }, - { "productivity-processor", 4 }, - { "pollution-clean-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 400, ingredients = { { "automation-science-pack", 1 }, @@ -974,16 +757,7 @@ if settings.startup["bobmods-modules-enablegodmodules"].value == true then "effectivity-module-2", "pollution-clean-module-2", }, - unit = bobmods.modules.ModulesLab and { - count = 50, - ingredients = { - { "speed-processor", 1 }, - { "effectivity-processor", 1 }, - { "productivity-processor", 1 }, - { "pollution-clean-processor", 1 }, - }, - time = 30, - } or { + unit = { count = 200, ingredients = { { "automation-science-pack", 1 }, @@ -1011,17 +785,7 @@ if settings.startup["bobmods-modules-enablegodmodules"].value == true then "effectivity-module-4", "pollution-clean-module-4", }, - unit = bobmods.modules.ModulesLab and { - count = 100, - ingredients = { - { "speed-processor", 2 }, - { "effectivity-processor", 2 }, - { "productivity-processor", 2 }, - { "pollution-clean-processor", 2 }, - { "module-circuit-board", 1 }, - }, - time = 60, - } or { + unit = { count = 300, ingredients = { { "automation-science-pack", 1 }, @@ -1050,18 +814,7 @@ if settings.startup["bobmods-modules-enablegodmodules"].value == true then "effectivity-module-6", "pollution-clean-module-6", }, - unit = bobmods.modules.ModulesLab and { - count = 100, - ingredients = { - { "speed-processor", 4 }, - { "effectivity-processor", 4 }, - { "productivity-processor", 4 }, - { "pollution-clean-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 400, ingredients = { { "automation-science-pack", 1 }, @@ -1091,18 +844,7 @@ if settings.startup["bobmods-modules-enablegodmodules"].value == true then "effectivity-module-8", "pollution-clean-module-8", }, - unit = bobmods.modules.ModulesLab and { - count = 250, - ingredients = { - { "speed-processor", 4 }, - { "effectivity-processor", 4 }, - { "productivity-processor", 4 }, - { "pollution-clean-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 500, ingredients = { { "automation-science-pack", 1 }, @@ -1126,18 +868,7 @@ if settings.startup["bobmods-modules-enablegodmodules"].value == true then }, }, prerequisites = { "god-module-4" }, - unit = bobmods.modules.ModulesLab and { - count = 500, - ingredients = { - { "speed-processor", 4 }, - { "effectivity-processor", 4 }, - { "productivity-processor", 4 }, - { "pollution-clean-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 600, ingredients = { { "automation-science-pack", 1 }, diff --git a/bobmodules/prototypes/technology/module.lua b/bobmodules/prototypes/technology/module.lua index 68dbfd7b2..8de427be5 100644 --- a/bobmodules/prototypes/technology/module.lua +++ b/bobmodules/prototypes/technology/module.lua @@ -8,17 +8,10 @@ data.raw["technology"]["speed-module-3"].icon = "__bobmodules__/graphics/icons/s data.raw["technology"]["speed-module-3"].icon_size = 32 data.raw["technology"]["speed-module-3"].icon_mipmaps = 0 -if bobmods.modules.ModulesLab then - data.raw["technology"]["speed-module"].unit = { count = 25, ingredients = { { "speed-processor", 1 } }, time = 30 } - data.raw["technology"]["speed-module-2"].unit = { count = 50, ingredients = { { "speed-processor", 1 } }, time = 30 } - data.raw["technology"]["speed-module-3"].unit = - { count = 50, ingredients = { { "speed-processor", 2 }, { "module-circuit-board", 1 } }, time = 60 } -else - bobmods.lib.tech.remove_science_pack("speed-module-2", "chemical-science-pack") - bobmods.lib.tech.remove_science_pack("speed-module-3", "production-science-pack") - bobmods.lib.tech.set_science_pack_count("speed-module-2", 100) - bobmods.lib.tech.set_science_pack_count("speed-module-3", 150) -end +bobmods.lib.tech.remove_science_pack("speed-module-2", "chemical-science-pack") +bobmods.lib.tech.remove_science_pack("speed-module-3", "production-science-pack") +bobmods.lib.tech.set_science_pack_count("speed-module-2", 100) +bobmods.lib.tech.set_science_pack_count("speed-module-3", 150) data.raw["technology"]["speed-module"].upgrade = false data.raw["technology"]["speed-module-2"].upgrade = false @@ -37,14 +30,7 @@ data:extend({ }, }, prerequisites = { "speed-module-3" }, - unit = bobmods.modules.ModulesLab and { - count = 50, - ingredients = { - { "speed-processor", 4 }, - { "module-circuit-board", 2 }, - }, - time = 60, - } or { + unit = { count = 200, ingredients = { { "automation-science-pack", 1 }, @@ -67,15 +53,7 @@ data:extend({ }, }, prerequisites = { "speed-module-4" }, - unit = bobmods.modules.ModulesLab and { - count = 75, - ingredients = { - { "speed-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 250, ingredients = { { "automation-science-pack", 1 }, @@ -98,15 +76,7 @@ data:extend({ }, }, prerequisites = { "speed-module-5" }, - unit = bobmods.modules.ModulesLab and { - count = 100, - ingredients = { - { "speed-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 300, ingredients = { { "automation-science-pack", 1 }, @@ -130,15 +100,7 @@ data:extend({ }, }, prerequisites = { "speed-module-6" }, - unit = bobmods.modules.ModulesLab and { - count = 150, - ingredients = { - { "speed-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 350, ingredients = { { "automation-science-pack", 1 }, @@ -162,15 +124,7 @@ data:extend({ }, }, prerequisites = { "speed-module-7" }, - unit = bobmods.modules.ModulesLab and { - count = 250, - ingredients = { - { "speed-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 400, ingredients = { { "automation-science-pack", 1 }, @@ -196,19 +150,10 @@ data.raw["technology"]["effectivity-module"].icon_mipmaps = 0 data.raw["technology"]["effectivity-module-2"].icon_mipmaps = 0 data.raw["technology"]["effectivity-module-3"].icon_mipmaps = 0 -if bobmods.modules.ModulesLab then - data.raw["technology"]["effectivity-module"].unit = - { count = 25, ingredients = { { "effectivity-processor", 1 } }, time = 30 } - data.raw["technology"]["effectivity-module-2"].unit = - { count = 50, ingredients = { { "effectivity-processor", 1 } }, time = 30 } - data.raw["technology"]["effectivity-module-3"].unit = - { count = 50, ingredients = { { "effectivity-processor", 2 }, { "module-circuit-board", 1 } }, time = 60 } -else - bobmods.lib.tech.remove_science_pack("effectivity-module-2", "chemical-science-pack") - bobmods.lib.tech.remove_science_pack("effectivity-module-3", "production-science-pack") - bobmods.lib.tech.set_science_pack_count("effectivity-module-2", 100) - bobmods.lib.tech.set_science_pack_count("effectivity-module-3", 150) -end +bobmods.lib.tech.remove_science_pack("effectivity-module-2", "chemical-science-pack") +bobmods.lib.tech.remove_science_pack("effectivity-module-3", "production-science-pack") +bobmods.lib.tech.set_science_pack_count("effectivity-module-2", 100) +bobmods.lib.tech.set_science_pack_count("effectivity-module-3", 150) data.raw["technology"]["effectivity-module"].upgrade = false data.raw["technology"]["effectivity-module-2"].upgrade = false @@ -227,14 +172,7 @@ data:extend({ }, }, prerequisites = { "effectivity-module-3" }, - unit = bobmods.modules.ModulesLab and { - count = 50, - ingredients = { - { "effectivity-processor", 4 }, - { "module-circuit-board", 2 }, - }, - time = 60, - } or { + unit = { count = 200, ingredients = { { "automation-science-pack", 1 }, @@ -257,15 +195,7 @@ data:extend({ }, }, prerequisites = { "effectivity-module-4" }, - unit = bobmods.modules.ModulesLab and { - count = 75, - ingredients = { - { "effectivity-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 250, ingredients = { { "automation-science-pack", 1 }, @@ -288,15 +218,7 @@ data:extend({ }, }, prerequisites = { "effectivity-module-5" }, - unit = bobmods.modules.ModulesLab and { - count = 100, - ingredients = { - { "effectivity-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 300, ingredients = { { "automation-science-pack", 1 }, @@ -320,15 +242,7 @@ data:extend({ }, }, prerequisites = { "effectivity-module-6" }, - unit = bobmods.modules.ModulesLab and { - count = 150, - ingredients = { - { "effectivity-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 350, ingredients = { { "automation-science-pack", 1 }, @@ -352,15 +266,7 @@ data:extend({ }, }, prerequisites = { "effectivity-module-7" }, - unit = bobmods.modules.ModulesLab and { - count = 250, - ingredients = { - { "effectivity-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 400, ingredients = { { "automation-science-pack", 1 }, @@ -386,19 +292,10 @@ data.raw["technology"]["productivity-module"].icon_mipmaps = 0 data.raw["technology"]["productivity-module-2"].icon_mipmaps = 0 data.raw["technology"]["productivity-module-3"].icon_mipmaps = 0 -if bobmods.modules.ModulesLab then - data.raw["technology"]["productivity-module"].unit = - { count = 25, ingredients = { { "productivity-processor", 1 } }, time = 30 } - data.raw["technology"]["productivity-module-2"].unit = - { count = 50, ingredients = { { "productivity-processor", 1 } }, time = 30 } - data.raw["technology"]["productivity-module-3"].unit = - { count = 50, ingredients = { { "productivity-processor", 2 }, { "module-circuit-board", 1 } }, time = 60 } -else - bobmods.lib.tech.remove_science_pack("productivity-module-2", "chemical-science-pack") - bobmods.lib.tech.remove_science_pack("productivity-module-3", "production-science-pack") - bobmods.lib.tech.set_science_pack_count("productivity-module-2", 100) - bobmods.lib.tech.set_science_pack_count("productivity-module-3", 150) -end +bobmods.lib.tech.remove_science_pack("productivity-module-2", "chemical-science-pack") +bobmods.lib.tech.remove_science_pack("productivity-module-3", "production-science-pack") +bobmods.lib.tech.set_science_pack_count("productivity-module-2", 100) +bobmods.lib.tech.set_science_pack_count("productivity-module-3", 150) data.raw["technology"]["productivity-module"].upgrade = false data.raw["technology"]["productivity-module-2"].upgrade = false @@ -417,14 +314,7 @@ data:extend({ }, }, prerequisites = { "productivity-module-3" }, - unit = bobmods.modules.ModulesLab and { - count = 50, - ingredients = { - { "productivity-processor", 4 }, - { "module-circuit-board", 2 }, - }, - time = 60, - } or { + unit = { count = 200, ingredients = { { "automation-science-pack", 1 }, @@ -447,15 +337,7 @@ data:extend({ }, }, prerequisites = { "productivity-module-4" }, - unit = bobmods.modules.ModulesLab and { - count = 75, - ingredients = { - { "productivity-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 250, ingredients = { { "automation-science-pack", 1 }, @@ -478,15 +360,7 @@ data:extend({ }, }, prerequisites = { "productivity-module-5" }, - unit = bobmods.modules.ModulesLab and { - count = 100, - ingredients = { - { "productivity-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 300, ingredients = { { "automation-science-pack", 1 }, @@ -510,15 +384,7 @@ data:extend({ }, }, prerequisites = { "productivity-module-6" }, - unit = bobmods.modules.ModulesLab and { - count = 150, - ingredients = { - { "productivity-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 350, ingredients = { { "automation-science-pack", 1 }, @@ -542,15 +408,7 @@ data:extend({ }, }, prerequisites = { "productivity-module-7" }, - unit = bobmods.modules.ModulesLab and { - count = 250, - ingredients = { - { "productivity-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 400, ingredients = { { "automation-science-pack", 1 }, @@ -577,13 +435,7 @@ data:extend({ }, }, prerequisites = { "modules" }, - unit = bobmods.modules.ModulesLab and { - count = 25, - ingredients = { - { "pollution-clean-processor", 1 }, - }, - time = 30, - } or { + unit = { count = 50, ingredients = { { "automation-science-pack", 1 }, @@ -605,13 +457,7 @@ data:extend({ }, }, prerequisites = { "pollution-clean-module-1" }, - unit = bobmods.modules.ModulesLab and { - count = 50, - ingredients = { - { "pollution-clean-processor", 1 }, - }, - time = 30, - } or { + unit = { count = 100, ingredients = { { "automation-science-pack", 1 }, @@ -633,14 +479,7 @@ data:extend({ }, }, prerequisites = { "pollution-clean-module-2" }, - unit = bobmods.modules.ModulesLab and { - count = 50, - ingredients = { - { "pollution-clean-processor", 2 }, - { "module-circuit-board", 1 }, - }, - time = 60, - } or { + unit = { count = 150, ingredients = { { "automation-science-pack", 1 }, @@ -663,14 +502,7 @@ data:extend({ }, }, prerequisites = { "pollution-clean-module-3" }, - unit = bobmods.modules.ModulesLab and { - count = 50, - ingredients = { - { "pollution-clean-processor", 4 }, - { "module-circuit-board", 2 }, - }, - time = 60, - } or { + unit = { count = 200, ingredients = { { "automation-science-pack", 1 }, @@ -693,15 +525,7 @@ data:extend({ }, }, prerequisites = { "pollution-clean-module-4" }, - unit = bobmods.modules.ModulesLab and { - count = 75, - ingredients = { - { "pollution-clean-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 250, ingredients = { { "automation-science-pack", 1 }, @@ -724,15 +548,7 @@ data:extend({ }, }, prerequisites = { "pollution-clean-module-5" }, - unit = bobmods.modules.ModulesLab and { - count = 100, - ingredients = { - { "pollution-clean-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 300, ingredients = { { "automation-science-pack", 1 }, @@ -756,15 +572,7 @@ data:extend({ }, }, prerequisites = { "pollution-clean-module-6" }, - unit = bobmods.modules.ModulesLab and { - count = 150, - ingredients = { - { "pollution-clean-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 350, ingredients = { { "automation-science-pack", 1 }, @@ -788,15 +596,7 @@ data:extend({ }, }, prerequisites = { "pollution-clean-module-7" }, - unit = bobmods.modules.ModulesLab and { - count = 250, - ingredients = { - { "pollution-clean-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 400, ingredients = { { "automation-science-pack", 1 }, @@ -823,13 +623,7 @@ data:extend({ }, }, prerequisites = { "modules" }, - unit = bobmods.modules.ModulesLab and { - count = 25, - ingredients = { - { "pollution-create-processor", 1 }, - }, - time = 30, - } or { + unit = { count = 50, ingredients = { { "automation-science-pack", 1 }, @@ -851,13 +645,7 @@ data:extend({ }, }, prerequisites = { "pollution-create-module-1" }, - unit = bobmods.modules.ModulesLab and { - count = 50, - ingredients = { - { "pollution-create-processor", 1 }, - }, - time = 30, - } or { + unit = { count = 100, ingredients = { { "automation-science-pack", 1 }, @@ -879,14 +667,7 @@ data:extend({ }, }, prerequisites = { "pollution-create-module-2" }, - unit = bobmods.modules.ModulesLab and { - count = 50, - ingredients = { - { "pollution-create-processor", 2 }, - { "module-circuit-board", 1 }, - }, - time = 60, - } or { + unit = { count = 150, ingredients = { { "automation-science-pack", 1 }, @@ -909,14 +690,7 @@ data:extend({ }, }, prerequisites = { "pollution-create-module-3" }, - unit = bobmods.modules.ModulesLab and { - count = 50, - ingredients = { - { "pollution-create-processor", 4 }, - { "module-circuit-board", 2 }, - }, - time = 60, - } or { + unit = { count = 200, ingredients = { { "automation-science-pack", 1 }, @@ -939,15 +713,7 @@ data:extend({ }, }, prerequisites = { "pollution-create-module-4" }, - unit = bobmods.modules.ModulesLab and { - count = 75, - ingredients = { - { "pollution-create-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 250, ingredients = { { "automation-science-pack", 1 }, @@ -970,15 +736,7 @@ data:extend({ }, }, prerequisites = { "pollution-create-module-5" }, - unit = bobmods.modules.ModulesLab and { - count = 100, - ingredients = { - { "pollution-create-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 300, ingredients = { { "automation-science-pack", 1 }, @@ -1002,15 +760,7 @@ data:extend({ }, }, prerequisites = { "pollution-create-module-6" }, - unit = bobmods.modules.ModulesLab and { - count = 150, - ingredients = { - { "pollution-create-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 350, ingredients = { { "automation-science-pack", 1 }, @@ -1034,15 +784,7 @@ data:extend({ }, }, prerequisites = { "pollution-create-module-7" }, - unit = bobmods.modules.ModulesLab and { - count = 250, - ingredients = { - { "pollution-create-processor", 4 }, - { "module-circuit-board", 2 }, - { "module-case", 1 }, - }, - time = 120, - } or { + unit = { count = 400, ingredients = { { "automation-science-pack", 1 }, @@ -1104,7 +846,7 @@ if data.raw.technology["advanced-electronics-3"] then table.insert(data.raw.technology["productivity-module-6"].prerequisites, "advanced-electronics-3") table.insert(data.raw.technology["pollution-clean-module-6"].prerequisites, "advanced-electronics-3") table.insert(data.raw.technology["pollution-create-module-6"].prerequisites, "advanced-electronics-3") -elseif not bobmods.modules.ModulesLab then +else bobmods.lib.tech.add_prerequisite("speed-module-6", "production-science-pack") bobmods.lib.tech.add_prerequisite("effectivity-module-6", "production-science-pack") bobmods.lib.tech.add_prerequisite("productivity-module-6", "production-science-pack") diff --git a/bobmodules/settings-updates.lua b/bobmodules/settings-updates.lua index bd95628b4..e69de29bb 100644 --- a/bobmodules/settings-updates.lua +++ b/bobmodules/settings-updates.lua @@ -1,3 +0,0 @@ -if mods["IndustrialRevolution"] then - data.raw["bool-setting"]["bobmods-modules-enable-modules-lab"].hidden = true -end diff --git a/bobmodules/settings.lua b/bobmodules/settings.lua index 4f71bd740..9a0a3f35e 100644 --- a/bobmodules/settings.lua +++ b/bobmodules/settings.lua @@ -179,10 +179,4 @@ data:extend({ maximum_value = 1, minimum_value = 0, }, - { - type = "bool-setting", - name = "bobmods-modules-enable-modules-lab", - setting_type = "startup", - default_value = true, - }, }) From 1c64b7f13528820955bf250f7c308fb8639767aa Mon Sep 17 00:00:00 2001 From: StyLuaFormatter Date: Sat, 7 Sep 2024 11:59:15 +0000 Subject: [PATCH 6/7] Format Code --- bobmodules/prototypes/item/electronics.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/bobmodules/prototypes/item/electronics.lua b/bobmodules/prototypes/item/electronics.lua index 42987960d..e8f62e6a9 100644 --- a/bobmodules/prototypes/item/electronics.lua +++ b/bobmodules/prototypes/item/electronics.lua @@ -64,7 +64,6 @@ data:extend({ }, }) - data:extend({ { type = "item", From 0b350c52dcecef66dde2fc0fc68f3133dc6ad9de Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Sun, 8 Sep 2024 18:38:21 +1200 Subject: [PATCH 7/7] Show more modules in Alt mode for electronics machines --- bobassembly/prototypes/assembly-electronics.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bobassembly/prototypes/assembly-electronics.lua b/bobassembly/prototypes/assembly-electronics.lua index 1e9bc57a9..d7f2f3543 100644 --- a/bobassembly/prototypes/assembly-electronics.lua +++ b/bobassembly/prototypes/assembly-electronics.lua @@ -297,6 +297,7 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then energy_usage = "213.75kW", module_specification = { module_slots = 4, + module_info_max_icons_per_row = 3, }, allowed_effects = { "consumption", "speed", "productivity", "pollution" }, }, @@ -469,6 +470,7 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then energy_usage = "360kW", module_specification = { module_slots = 6, + module_info_max_icons_per_row = 3, }, allowed_effects = { "consumption", "speed", "productivity", "pollution" }, },