diff --git a/bobequipment/prototypes/recipe/equipment.lua b/bobequipment/prototypes/recipe/equipment.lua index c2e67603..f8e0bb3d 100644 --- a/bobequipment/prototypes/recipe/equipment.lua +++ b/bobequipment/prototypes/recipe/equipment.lua @@ -26,7 +26,7 @@ data:extend({ ingredients = { { type = "item", name = "energy-shield-mk3-equipment", amount = 2 }, { type = "item", name = "processing-unit", amount = 5 }, - { type = "item", name = "effectivity-module-3", amount = 1 }, + { type = "item", name = "efficiency-module-3", amount = 1 }, { type = "item", name = "productivity-module-3", amount = 1 }, }, results = { { type = "item", name = "energy-shield-mk4-equipment", amount = 1 } }, @@ -39,7 +39,7 @@ data:extend({ ingredients = { { type = "item", name = "energy-shield-mk4-equipment", amount = 2 }, { type = "item", name = "processing-unit", amount = 5 }, - { type = "item", name = "effectivity-module-3", amount = 1 }, + { type = "item", name = "efficiency-module-3", amount = 1 }, { type = "item", name = "productivity-module-3", amount = 1 }, }, results = { { type = "item", name = "energy-shield-mk5-equipment", amount = 1 } }, @@ -52,7 +52,7 @@ data:extend({ ingredients = { { type = "item", name = "energy-shield-mk5-equipment", amount = 2 }, { type = "item", name = "processing-unit", amount = 5 }, - { type = "item", name = "effectivity-module-3", amount = 1 }, + { type = "item", name = "efficiency-module-3", amount = 1 }, { type = "item", name = "productivity-module-3", amount = 1 }, }, results = { { type = "item", name = "energy-shield-mk6-equipment", amount = 1 } }, @@ -123,7 +123,7 @@ data:extend({ ingredients = { { type = "item", name = "fusion-reactor-equipment", amount = 1 }, { type = "item", name = "processing-unit", amount = 50 }, - { type = "item", name = "effectivity-module-3", amount = 2 }, + { type = "item", name = "efficiency-module-3", amount = 2 }, { type = "item", name = "speed-module-3", amount = 2 }, { type = "item", name = "productivity-module-3", amount = 2 }, }, @@ -137,7 +137,7 @@ data:extend({ ingredients = { { type = "item", name = "fusion-reactor-equipment-2", amount = 1 }, { type = "item", name = "processing-unit", amount = 50 }, - { type = "item", name = "effectivity-module-3", amount = 2 }, + { type = "item", name = "efficiency-module-3", amount = 2 }, { type = "item", name = "speed-module-3", amount = 2 }, { type = "item", name = "productivity-module-3", amount = 2 }, }, @@ -151,7 +151,7 @@ data:extend({ ingredients = { { type = "item", name = "fusion-reactor-equipment-3", amount = 1 }, { type = "item", name = "processing-unit", amount = 50 }, - { type = "item", name = "effectivity-module-3", amount = 2 }, + { type = "item", name = "efficiency-module-3", amount = 2 }, { type = "item", name = "speed-module-3", amount = 2 }, { type = "item", name = "productivity-module-3", amount = 2 }, }, diff --git a/bobequipment/prototypes/recipe/updates.lua b/bobequipment/prototypes/recipe/updates.lua index 10e722b5..fb0e5986 100644 --- a/bobequipment/prototypes/recipe/updates.lua +++ b/bobequipment/prototypes/recipe/updates.lua @@ -463,9 +463,9 @@ if data.raw.item["gilded-copper-cable"] then bobmods.lib.recipe.replace_ingredient("solar-panel-equipment-4", "copper-cable", "gilded-copper-cable") end -if data.raw.module["effectivity-module-4"] then - bobmods.lib.recipe.replace_ingredient("energy-shield-mk4-equipment", "effectivity-module-3", "effectivity-module-4") - bobmods.lib.recipe.replace_ingredient("fusion-reactor-equipment-2", "effectivity-module-3", "effectivity-module-4") +if data.raw.module["efficiency-module-4"] then + bobmods.lib.recipe.replace_ingredient("energy-shield-mk4-equipment", "efficiency-module-3", "efficiency-module-4") + bobmods.lib.recipe.replace_ingredient("fusion-reactor-equipment-2", "efficiency-module-3", "efficiency-module-4") end if data.raw.module["speed-module-4"] then @@ -477,9 +477,9 @@ if data.raw.module["productivity-module-4"] then bobmods.lib.recipe.replace_ingredient("fusion-reactor-equipment-2", "productivity-module-3", "productivity-module-4") end -if data.raw.module["effectivity-module-6"] then - bobmods.lib.recipe.replace_ingredient("energy-shield-mk5-equipment", "effectivity-module-3", "effectivity-module-6") - bobmods.lib.recipe.replace_ingredient("fusion-reactor-equipment-3", "effectivity-module-3", "effectivity-module-6") +if data.raw.module["efficiency-module-6"] then + bobmods.lib.recipe.replace_ingredient("energy-shield-mk5-equipment", "efficiency-module-3", "efficiency-module-6") + bobmods.lib.recipe.replace_ingredient("fusion-reactor-equipment-3", "efficiency-module-3", "efficiency-module-6") end if data.raw.module["speed-module-6"] then @@ -491,9 +491,9 @@ if data.raw.module["productivity-module-6"] then bobmods.lib.recipe.replace_ingredient("fusion-reactor-equipment-3", "productivity-module-3", "productivity-module-6") end -if data.raw.module["effectivity-module-8"] then - bobmods.lib.recipe.replace_ingredient("energy-shield-mk6-equipment", "effectivity-module-3", "effectivity-module-8") - bobmods.lib.recipe.replace_ingredient("fusion-reactor-equipment-4", "effectivity-module-3", "effectivity-module-8") +if data.raw.module["efficiency-module-8"] then + bobmods.lib.recipe.replace_ingredient("energy-shield-mk6-equipment", "efficiency-module-3", "efficiency-module-8") + bobmods.lib.recipe.replace_ingredient("fusion-reactor-equipment-4", "efficiency-module-3", "efficiency-module-8") end if data.raw.module["speed-module-8"] then diff --git a/bobequipment/prototypes/technology/technology-updates.lua b/bobequipment/prototypes/technology/technology-updates.lua index 1182a48c..38df3dfd 100644 --- a/bobequipment/prototypes/technology/technology-updates.lua +++ b/bobequipment/prototypes/technology/technology-updates.lua @@ -119,12 +119,12 @@ else bobmods.lib.tech.add_prerequisite("fusion-reactor-equipment-2", "speed-module-3") end -if data.raw.technology["effectivity-module-4"] then - bobmods.lib.tech.add_prerequisite("bob-energy-shield-equipment-4", "effectivity-module-4") - bobmods.lib.tech.add_prerequisite("fusion-reactor-equipment-2", "effectivity-module-4") +if data.raw.technology["efficiency-module-4"] then + bobmods.lib.tech.add_prerequisite("bob-energy-shield-equipment-4", "efficiency-module-4") + bobmods.lib.tech.add_prerequisite("fusion-reactor-equipment-2", "efficiency-module-4") else - bobmods.lib.tech.add_prerequisite("bob-energy-shield-equipment-4", "effectivity-module-3") - bobmods.lib.tech.add_prerequisite("fusion-reactor-equipment-2", "effectivity-module-3") + bobmods.lib.tech.add_prerequisite("bob-energy-shield-equipment-4", "efficiency-module-3") + bobmods.lib.tech.add_prerequisite("fusion-reactor-equipment-2", "efficiency-module-3") end if data.raw.technology["productivity-module-4"] then @@ -139,9 +139,9 @@ if data.raw.technology["speed-module-6"] then bobmods.lib.tech.add_prerequisite("fusion-reactor-equipment-3", "speed-module-6") end -if data.raw.technology["effectivity-module-6"] then - bobmods.lib.tech.add_prerequisite("bob-energy-shield-equipment-5", "effectivity-module-6") - bobmods.lib.tech.add_prerequisite("fusion-reactor-equipment-3", "effectivity-module-6") +if data.raw.technology["efficiency-module-6"] then + bobmods.lib.tech.add_prerequisite("bob-energy-shield-equipment-5", "efficiency-module-6") + bobmods.lib.tech.add_prerequisite("fusion-reactor-equipment-3", "efficiency-module-6") end if data.raw.technology["productivity-module-6"] then @@ -153,9 +153,9 @@ if data.raw.technology["speed-module-8"] then bobmods.lib.tech.add_prerequisite("fusion-reactor-equipment-4", "speed-module-8") end -if data.raw.technology["effectivity-module-8"] then - bobmods.lib.tech.add_prerequisite("bob-energy-shield-equipment-6", "effectivity-module-8") - bobmods.lib.tech.add_prerequisite("fusion-reactor-equipment-4", "effectivity-module-8") +if data.raw.technology["efficiency-module-8"] then + bobmods.lib.tech.add_prerequisite("bob-energy-shield-equipment-6", "efficiency-module-8") + bobmods.lib.tech.add_prerequisite("fusion-reactor-equipment-4", "efficiency-module-8") end if data.raw.technology["productivity-module-8"] then diff --git a/bobmodules/control.lua b/bobmodules/control.lua index a55d3c5e..e69de29b 100644 --- a/bobmodules/control.lua +++ b/bobmodules/control.lua @@ -1,18 +0,0 @@ -function setup(event) - if remote.interfaces["DiscoScience"] and remote.interfaces["DiscoScience"]["setIngredientColor"] then - remote.call("DiscoScience", "setIngredientColor", "module-case", { r = 0.5, g = 0.5, b = 0.5 }) - remote.call("DiscoScience", "setIngredientColor", "module-circuit-board", { r = 0.0, g = 1.0, b = 0.0 }) - remote.call("DiscoScience", "setIngredientColor", "speed-processor", { r = 0.0, g = 0.2, b = 1.0 }) - remote.call("DiscoScience", "setIngredientColor", "effectivity-processor", { r = 0.6, g = 1.0, b = 0.2 }) - remote.call("DiscoScience", "setIngredientColor", "productivity-processor", { r = 0.875, g = 0.375, b = 1.0 }) - remote.call("DiscoScience", "setIngredientColor", "pollution-clean-processor", { r = 0.5, g = 1.0, b = 0.75 }) - remote.call("DiscoScience", "setIngredientColor", "pollution-create-processor", { r = 1.0, g = 0.75, b = 0.5 }) - end - - if remote.interfaces["DiscoScience"] and remote.interfaces["DiscoScience"]["setLabScale"] then - remote.call("DiscoScience", "setLabScale", "lab-module", 1) - end -end - -script.on_init(setup) -script.on_configuration_changed(setup) diff --git a/bobmodules/data-updates.lua b/bobmodules/data-updates.lua index 795fade9..f3a41b62 100644 --- a/bobmodules/data-updates.lua +++ b/bobmodules/data-updates.lua @@ -19,10 +19,10 @@ bobmods.lib.tech.add_prerequisite("effect-transmission", "chemical-science-pack" bobmods.lib.tech.remove_prerequisite("speed-module-2", "advanced-electronics-2") bobmods.lib.tech.remove_prerequisite("productivity-module-2", "advanced-electronics-2") -bobmods.lib.tech.remove_prerequisite("effectivity-module-2", "advanced-electronics-2") +bobmods.lib.tech.remove_prerequisite("efficiency-module-2", "advanced-electronics-2") bobmods.lib.tech.remove_prerequisite("speed-module-3", "production-science-pack") bobmods.lib.tech.remove_prerequisite("productivity-module-3", "production-science-pack") -bobmods.lib.tech.remove_prerequisite("effectivity-module-3", "production-science-pack") +bobmods.lib.tech.remove_prerequisite("efficiency-module-3", "production-science-pack") if data.raw["recipe-category"]["electronics-with-fluid"] then data.raw.recipe["module-circuit-board"].category = "electronics-with-fluid" @@ -33,7 +33,7 @@ end if data.raw["recipe-category"]["electronics"] then data.raw.recipe["speed-processor"].category = "electronics" - data.raw.recipe["effectivity-processor"].category = "electronics" + data.raw.recipe["efficiency-processor"].category = "electronics" data.raw.recipe["productivity-processor"].category = "electronics" data.raw.recipe["pollution-clean-processor"].category = "electronics" data.raw.recipe["pollution-create-processor"].category = "electronics" @@ -41,12 +41,12 @@ end if data.raw["recipe-category"]["electronics-machine"] then data.raw.recipe["speed-processor-2"].category = "electronics-machine" - data.raw.recipe["effectivity-processor-2"].category = "electronics-machine" + data.raw.recipe["efficiency-processor-2"].category = "electronics-machine" data.raw.recipe["productivity-processor-2"].category = "electronics-machine" data.raw.recipe["pollution-clean-processor-2"].category = "electronics-machine" data.raw.recipe["pollution-create-processor-2"].category = "electronics-machine" data.raw.recipe["speed-processor-3"].category = "electronics-machine" - data.raw.recipe["effectivity-processor-3"].category = "electronics-machine" + data.raw.recipe["efficiency-processor-3"].category = "electronics-machine" data.raw.recipe["productivity-processor-3"].category = "electronics-machine" data.raw.recipe["pollution-clean-processor-3"].category = "electronics-machine" data.raw.recipe["pollution-create-processor-3"].category = "electronics-machine" @@ -59,17 +59,17 @@ bobmods.lib.module.add_productivity_limitation("module-processor-board") bobmods.lib.module.add_productivity_limitation("module-processor-board-2") bobmods.lib.module.add_productivity_limitation("module-processor-board-3") bobmods.lib.module.add_productivity_limitation("speed-processor") -bobmods.lib.module.add_productivity_limitation("effectivity-processor") +bobmods.lib.module.add_productivity_limitation("efficiency-processor") bobmods.lib.module.add_productivity_limitation("productivity-processor") bobmods.lib.module.add_productivity_limitation("pollution-clean-processor") bobmods.lib.module.add_productivity_limitation("pollution-create-processor") bobmods.lib.module.add_productivity_limitation("speed-processor-2") -bobmods.lib.module.add_productivity_limitation("effectivity-processor-2") +bobmods.lib.module.add_productivity_limitation("efficiency-processor-2") bobmods.lib.module.add_productivity_limitation("productivity-processor-2") bobmods.lib.module.add_productivity_limitation("pollution-clean-processor-2") bobmods.lib.module.add_productivity_limitation("pollution-create-processor-2") bobmods.lib.module.add_productivity_limitation("speed-processor-3") -bobmods.lib.module.add_productivity_limitation("effectivity-processor-3") +bobmods.lib.module.add_productivity_limitation("efficiency-processor-3") bobmods.lib.module.add_productivity_limitation("productivity-processor-3") bobmods.lib.module.add_productivity_limitation("pollution-clean-processor-3") bobmods.lib.module.add_productivity_limitation("pollution-create-processor-3") diff --git a/bobmodules/graphics/icons/effectivity-processor-2.png b/bobmodules/graphics/icons/efficiency-processor-2.png similarity index 100% rename from bobmodules/graphics/icons/effectivity-processor-2.png rename to bobmodules/graphics/icons/efficiency-processor-2.png diff --git a/bobmodules/graphics/icons/effectivity-processor-3.png b/bobmodules/graphics/icons/efficiency-processor-3.png similarity index 100% rename from bobmodules/graphics/icons/effectivity-processor-3.png rename to bobmodules/graphics/icons/efficiency-processor-3.png diff --git a/bobmodules/graphics/icons/effectivity-processor.png b/bobmodules/graphics/icons/efficiency-processor.png similarity index 100% rename from bobmodules/graphics/icons/effectivity-processor.png rename to bobmodules/graphics/icons/efficiency-processor.png diff --git a/bobmodules/locale/en/bobmodules.cfg b/bobmodules/locale/en/bobmodules.cfg index 9ff335db..ac355bf5 100644 --- a/bobmodules/locale/en/bobmodules.cfg +++ b/bobmodules/locale/en/bobmodules.cfg @@ -8,14 +8,14 @@ speed-module-6=Speed Module 6 speed-module-7=Speed Module 7 speed-module-8=Speed Module 8 -effectivity-module=Efficiency Module 1 -effectivity-module-2=Efficiency Module 2 -effectivity-module-3=Efficiency Module 3 -effectivity-module-4=Efficiency Module 4 -effectivity-module-5=Efficiency Module 5 -effectivity-module-6=Efficiency Module 6 -effectivity-module-7=Efficiency Module 7 -effectivity-module-8=Efficiency Module 8 +efficiency-module=Efficiency Module 1 +efficiency-module-2=Efficiency Module 2 +efficiency-module-3=Efficiency Module 3 +efficiency-module-4=Efficiency Module 4 +efficiency-module-5=Efficiency Module 5 +efficiency-module-6=Efficiency Module 6 +efficiency-module-7=Efficiency Module 7 +efficiency-module-8=Efficiency Module 8 productivity-module=Productivity Module 1 productivity-module-2=Productivity Module 2 @@ -88,19 +88,19 @@ module-processor-board-2=Module logic board module-processor-board-3=Module processor board speed-processor=Speed circuit board -effectivity-processor=Efficiency circuit board +efficiency-processor=Efficiency circuit board productivity-processor=Productivity circuit board pollution-clean-processor=Pollution cleaning circuit board pollution-create-processor=Pollution producing circuit board speed-processor-2=Speed logic board -effectivity-processor-2=Efficiency logic board +efficiency-processor-2=Efficiency logic board productivity-processor-2=Productivity logic board pollution-clean-processor-2=Pollution cleaning logic board pollution-create-processor-2=Pollution producing logic board speed-processor-3=Speed processor board -effectivity-processor-3=Efficiency processor board +efficiency-processor-3=Efficiency processor board productivity-processor-3=Productivity processor board pollution-clean-processor-3=Pollution cleaning processor board pollution-create-processor-3=Pollution producing processor board diff --git a/bobmodules/locale/ru/bobmodules.cfg b/bobmodules/locale/ru/bobmodules.cfg index 0aee0593..5ec26628 100644 --- a/bobmodules/locale/ru/bobmodules.cfg +++ b/bobmodules/locale/ru/bobmodules.cfg @@ -8,14 +8,14 @@ speed-module-6=Модуль скорости 6 speed-module-7=Модуль скорости 7 speed-module-8=Модуль скорости 8 -effectivity-module=Модуль эффективности 1 -effectivity-module-2=Модуль эффективности 2 -effectivity-module-3=Модуль эффективности 3 -effectivity-module-4=Модуль эффективности 4 -effectivity-module-5=Модуль эффективности 5 -effectivity-module-6=Модуль эффективности 6 -effectivity-module-7=Модуль эффективности 7 -effectivity-module-8=Модуль эффективности 8 +efficiency-module=Модуль эффективности 1 +efficiency-module-2=Модуль эффективности 2 +efficiency-module-3=Модуль эффективности 3 +efficiency-module-4=Модуль эффективности 4 +efficiency-module-5=Модуль эффективности 5 +efficiency-module-6=Модуль эффективности 6 +efficiency-module-7=Модуль эффективности 7 +efficiency-module-8=Модуль эффективности 8 productivity-module=Модуль продуктивности 1 productivity-module-2=Модуль продуктивности 2 @@ -90,19 +90,19 @@ module-processor-board-2=Улучшенный контроллер модуля module-processor-board-3=Процессорный контроллер модуля speed-processor=Схема модуля скорости -effectivity-processor=Схема модуля эффективности +efficiency-processor=Схема модуля эффективности productivity-processor=Схема модуля продуктивности pollution-clean-processor=Схема модуля уменьшения загрязнения pollution-create-processor=Схема модуля увеличения загрязнения speed-processor-2=Схема улучшенного модуля скорости -effectivity-processor-2=Схема улучшенного модуля эффективности +efficiency-processor-2=Схема улучшенного модуля эффективности productivity-processor-2=Схема улучшенного модуля продуктивности pollution-clean-processor-2=Схема улучшенного модуля уменьшения загрязнения pollution-create-processor-2=Схема улучшенного модуля увеличения загрязнения speed-processor-3=Схема супермодуля скорости -effectivity-processor-3=Схема супермодуля эффективности +efficiency-processor-3=Схема супермодуля эффективности productivity-processor-3=Схема супермодуля продуктивности pollution-clean-processor-3=Схема супермодуля уменьшения загрязнения pollution-create-processor-3=Схема супермодуля увеличения загрязнения diff --git a/bobmodules/prototypes/category.lua b/bobmodules/prototypes/category.lua index b7781b4f..de066f2a 100644 --- a/bobmodules/prototypes/category.lua +++ b/bobmodules/prototypes/category.lua @@ -48,7 +48,7 @@ data:extend({ }, { type = "item-subgroup", - name = "effectivity-module", + name = "efficiency-module", group = "bobmodules", order = "f-2", }, diff --git a/bobmodules/prototypes/item/electronics.lua b/bobmodules/prototypes/item/electronics.lua index e8f62e6a..d0ef78d2 100644 --- a/bobmodules/prototypes/item/electronics.lua +++ b/bobmodules/prototypes/item/electronics.lua @@ -28,11 +28,11 @@ data:extend({ }, { type = "item", - name = "effectivity-processor", - icon = "__bobmodules__/graphics/icons/effectivity-processor.png", + name = "efficiency-processor", + icon = "__bobmodules__/graphics/icons/efficiency-processor.png", icon_size = 32, subgroup = "module-intermediates", - order = "c-c5[effectivity-processor-1]", + order = "c-c5[efficiency-processor-1]", stack_size = 100, }, { @@ -121,20 +121,20 @@ data:extend({ }, { type = "item", - name = "effectivity-processor-2", - icon = "__bobmodules__/graphics/icons/effectivity-processor-2.png", + name = "efficiency-processor-2", + icon = "__bobmodules__/graphics/icons/efficiency-processor-2.png", icon_size = 32, subgroup = "module-intermediates", - order = "c-c5[effectivity-processor-2]", + order = "c-c5[efficiency-processor-2]", stack_size = 100, }, { type = "item", - name = "effectivity-processor-3", - icon = "__bobmodules__/graphics/icons/effectivity-processor-3.png", + name = "efficiency-processor-3", + icon = "__bobmodules__/graphics/icons/efficiency-processor-3.png", icon_size = 32, subgroup = "module-intermediates", - order = "c-c5[effectivity-processor-3]", + order = "c-c5[efficiency-processor-3]", stack_size = 100, }, { diff --git a/bobmodules/prototypes/item/module.lua b/bobmodules/prototypes/item/module.lua index 3f153de7..34d58c54 100644 --- a/bobmodules/prototypes/item/module.lua +++ b/bobmodules/prototypes/item/module.lua @@ -167,50 +167,50 @@ data:extend({ }, }) ---[[Effectivity Modules]] +--[[Efficiency Modules]] -- -data.raw["module"]["effectivity-module"].stack_size = 100 -data.raw["module"]["effectivity-module"].icon = "__bobmodules__/graphics/icons/yellow-module-1.png" -data.raw["module"]["effectivity-module"].icon_size = 32 -data.raw["module"]["effectivity-module"].subgroup = "effectivity-module" -data.raw["module"]["effectivity-module"].order = "m-e-1" -data.raw["module"]["effectivity-module"].default_request_amount = 10 -data.raw["module"]["effectivity-module"].beacon_tint = +data.raw["module"]["efficiency-module"].stack_size = 100 +data.raw["module"]["efficiency-module"].icon = "__bobmodules__/graphics/icons/yellow-module-1.png" +data.raw["module"]["efficiency-module"].icon_size = 32 +data.raw["module"]["efficiency-module"].subgroup = "efficiency-module" +data.raw["module"]["efficiency-module"].order = "m-e-1" +data.raw["module"]["efficiency-module"].default_request_amount = 10 +data.raw["module"]["efficiency-module"].beacon_tint = { primary = { r = 0.3, g = 0.6, b = 0.1 }, secondary = { r = 0.370, g = 1.000, b = 0.370, a = 1.000 } } -data.raw["module"]["effectivity-module"].effect = +data.raw["module"]["efficiency-module"].effect = { consumption = { bonus = -1 * bobmods.modules.ConsumptionPerLevel - bobmods.modules.ConsumptionBonus - 0.001 } } -data.raw["module"]["effectivity-module-2"].stack_size = 100 -data.raw["module"]["effectivity-module-2"].icon = "__bobmodules__/graphics/icons/yellow-module-2.png" -data.raw["module"]["effectivity-module-2"].icon_size = 32 -data.raw["module"]["effectivity-module-2"].subgroup = "effectivity-module" -data.raw["module"]["effectivity-module-2"].order = "m-e-2" -data.raw["module"]["effectivity-module-2"].default_request_amount = 10 -data.raw["module"]["effectivity-module-2"].beacon_tint = +data.raw["module"]["efficiency-module-2"].stack_size = 100 +data.raw["module"]["efficiency-module-2"].icon = "__bobmodules__/graphics/icons/yellow-module-2.png" +data.raw["module"]["efficiency-module-2"].icon_size = 32 +data.raw["module"]["efficiency-module-2"].subgroup = "efficiency-module" +data.raw["module"]["efficiency-module-2"].order = "m-e-2" +data.raw["module"]["efficiency-module-2"].default_request_amount = 10 +data.raw["module"]["efficiency-module-2"].beacon_tint = { primary = { r = 0.3, g = 0.6, b = 0.1 }, secondary = { r = 0.370, g = 1.000, b = 0.370, a = 1.000 } } -data.raw["module"]["effectivity-module-2"].effect = +data.raw["module"]["efficiency-module-2"].effect = { consumption = { bonus = -2 * bobmods.modules.ConsumptionPerLevel - bobmods.modules.ConsumptionBonus - 0.001 } } -data.raw["module"]["effectivity-module-3"].stack_size = 100 -data.raw["module"]["effectivity-module-3"].icon = "__bobmodules__/graphics/icons/yellow-module-3.png" -data.raw["module"]["effectivity-module-3"].icon_size = 32 -data.raw["module"]["effectivity-module-3"].subgroup = "effectivity-module" -data.raw["module"]["effectivity-module-3"].order = "m-e-3" -data.raw["module"]["effectivity-module-3"].default_request_amount = 10 -data.raw["module"]["effectivity-module-3"].beacon_tint = +data.raw["module"]["efficiency-module-3"].stack_size = 100 +data.raw["module"]["efficiency-module-3"].icon = "__bobmodules__/graphics/icons/yellow-module-3.png" +data.raw["module"]["efficiency-module-3"].icon_size = 32 +data.raw["module"]["efficiency-module-3"].subgroup = "efficiency-module" +data.raw["module"]["efficiency-module-3"].order = "m-e-3" +data.raw["module"]["efficiency-module-3"].default_request_amount = 10 +data.raw["module"]["efficiency-module-3"].beacon_tint = { primary = { r = 0.3, g = 0.6, b = 0.1 }, secondary = { r = 0.370, g = 1.000, b = 0.370, a = 1.000 } } -data.raw["module"]["effectivity-module-3"].effect = +data.raw["module"]["efficiency-module-3"].effect = { consumption = { bonus = -3 * bobmods.modules.ConsumptionPerLevel - bobmods.modules.ConsumptionBonus - 0.001 } } data:extend({ { type = "module", - name = "effectivity-module-4", + name = "efficiency-module-4", icon = "__bobmodules__/graphics/icons/yellow-module-4.png", icon_size = 32, - subgroup = "effectivity-module", - category = "effectivity", + subgroup = "efficiency-module", + category = "efficiency", tier = 4, order = "m-e-4", stack_size = 100, @@ -228,11 +228,11 @@ data:extend({ { type = "module", - name = "effectivity-module-5", + name = "efficiency-module-5", icon = "__bobmodules__/graphics/icons/yellow-module-5.png", icon_size = 32, - subgroup = "effectivity-module", - category = "effectivity", + subgroup = "efficiency-module", + category = "efficiency", tier = 5, order = "m-e-5", stack_size = 100, @@ -250,11 +250,11 @@ data:extend({ { type = "module", - name = "effectivity-module-6", + name = "efficiency-module-6", icon = "__bobmodules__/graphics/icons/yellow-module-6.png", icon_size = 32, - subgroup = "effectivity-module", - category = "effectivity", + subgroup = "efficiency-module", + category = "efficiency", tier = 6, order = "m-e-6", stack_size = 100, @@ -272,11 +272,11 @@ data:extend({ { type = "module", - name = "effectivity-module-7", + name = "efficiency-module-7", icon = "__bobmodules__/graphics/icons/yellow-module-7.png", icon_size = 32, - subgroup = "effectivity-module", - category = "effectivity", + subgroup = "efficiency-module", + category = "efficiency", tier = 7, order = "m-e-7", stack_size = 100, @@ -294,11 +294,11 @@ data:extend({ { type = "module", - name = "effectivity-module-8", + name = "efficiency-module-8", icon = "__bobmodules__/graphics/icons/yellow-module-8.png", icon_size = 32, - subgroup = "effectivity-module", - category = "effectivity", + subgroup = "efficiency-module", + category = "efficiency", tier = 8, order = "m-e-8", stack_size = 100, diff --git a/bobmodules/prototypes/recipe/electronics-updates.lua b/bobmodules/prototypes/recipe/electronics-updates.lua index 7a0d3988..5f932176 100644 --- a/bobmodules/prototypes/recipe/electronics-updates.lua +++ b/bobmodules/prototypes/recipe/electronics-updates.lua @@ -41,7 +41,7 @@ end if data.raw.item["basic-electronic-components"] then bobmods.lib.recipe.replace_ingredient("speed-processor", "electronic-circuit", "basic-electronic-components") - bobmods.lib.recipe.replace_ingredient("effectivity-processor", "electronic-circuit", "basic-electronic-components") + bobmods.lib.recipe.replace_ingredient("efficiency-processor", "electronic-circuit", "basic-electronic-components") bobmods.lib.recipe.replace_ingredient("productivity-processor", "electronic-circuit", "basic-electronic-components") bobmods.lib.recipe.replace_ingredient( "pollution-clean-processor", @@ -57,13 +57,13 @@ end if data.raw.item["electronic-components"] then bobmods.lib.recipe.replace_ingredient("speed-processor", "advanced-circuit", "electronic-components") - bobmods.lib.recipe.replace_ingredient("effectivity-processor", "advanced-circuit", "electronic-components") + bobmods.lib.recipe.replace_ingredient("efficiency-processor", "advanced-circuit", "electronic-components") bobmods.lib.recipe.replace_ingredient("productivity-processor", "advanced-circuit", "electronic-components") bobmods.lib.recipe.replace_ingredient("pollution-clean-processor", "advanced-circuit", "electronic-components") bobmods.lib.recipe.replace_ingredient("pollution-create-processor", "advanced-circuit", "electronic-components") bobmods.lib.recipe.replace_ingredient("speed-processor-2", "advanced-circuit", "electronic-components") - bobmods.lib.recipe.replace_ingredient("effectivity-processor-2", "advanced-circuit", "electronic-components") + bobmods.lib.recipe.replace_ingredient("efficiency-processor-2", "advanced-circuit", "electronic-components") bobmods.lib.recipe.replace_ingredient("productivity-processor-2", "advanced-circuit", "electronic-components") bobmods.lib.recipe.replace_ingredient("pollution-clean-processor-2", "advanced-circuit", "electronic-components") bobmods.lib.recipe.replace_ingredient("pollution-create-processor-2", "advanced-circuit", "electronic-components") @@ -71,13 +71,13 @@ end if data.raw.item["intergrated-electronics"] then bobmods.lib.recipe.replace_ingredient("speed-processor-2", "processing-unit", "intergrated-electronics") - bobmods.lib.recipe.replace_ingredient("effectivity-processor-2", "processing-unit", "intergrated-electronics") + bobmods.lib.recipe.replace_ingredient("efficiency-processor-2", "processing-unit", "intergrated-electronics") bobmods.lib.recipe.replace_ingredient("productivity-processor-2", "processing-unit", "intergrated-electronics") bobmods.lib.recipe.replace_ingredient("pollution-clean-processor-2", "processing-unit", "intergrated-electronics") bobmods.lib.recipe.replace_ingredient("pollution-create-processor-2", "processing-unit", "intergrated-electronics") bobmods.lib.recipe.replace_ingredient("speed-processor-3", "processing-unit", "intergrated-electronics") - bobmods.lib.recipe.replace_ingredient("effectivity-processor-3", "processing-unit", "intergrated-electronics") + bobmods.lib.recipe.replace_ingredient("efficiency-processor-3", "processing-unit", "intergrated-electronics") bobmods.lib.recipe.replace_ingredient("productivity-processor-3", "processing-unit", "intergrated-electronics") bobmods.lib.recipe.replace_ingredient("pollution-clean-processor-3", "processing-unit", "intergrated-electronics") bobmods.lib.recipe.replace_ingredient("pollution-create-processor-3", "processing-unit", "intergrated-electronics") @@ -86,7 +86,7 @@ end if data.raw.item["processing-electronics"] then bobmods.lib.recipe.add_ingredient("speed-processor-3", { type = "item", name = "processing-electronics", amount = 1 }) bobmods.lib.recipe.add_ingredient( - "effectivity-processor-3", + "efficiency-processor-3", { type = "item", name = "processing-electronics", amount = 1 } ) bobmods.lib.recipe.add_ingredient("productivity-processor-3", { type = "item", name = "processing-electronics", 1 }) @@ -105,7 +105,7 @@ else { type = "item", name = "advanced-processing-unit", amount = 1 } ) bobmods.lib.recipe.add_ingredient( - "effectivity-processor-3", + "efficiency-processor-3", { type = "item", name = "advanced-processing-unit", amount = 1 } ) bobmods.lib.recipe.add_ingredient( @@ -123,7 +123,7 @@ else else bobmods.lib.recipe.add_ingredient("speed-processor-3", { type = "item", name = "processing-unit", amount = 1 }) bobmods.lib.recipe.add_ingredient( - "effectivity-processor-3", + "efficiency-processor-3", { type = "item", name = "processing-unit", amount = 1 } ) bobmods.lib.recipe.add_ingredient( @@ -143,19 +143,19 @@ end if data.raw.item["solder"] then bobmods.lib.recipe.add_ingredient("speed-processor", { type = "item", name = "solder", amount = 1 }) - bobmods.lib.recipe.add_ingredient("effectivity-processor", { type = "item", name = "solder", amount = 1 }) + bobmods.lib.recipe.add_ingredient("efficiency-processor", { type = "item", name = "solder", amount = 1 }) bobmods.lib.recipe.add_ingredient("productivity-processor", { type = "item", name = "solder", amount = 1 }) bobmods.lib.recipe.add_ingredient("pollution-clean-processor", { type = "item", name = "solder", amount = 1 }) bobmods.lib.recipe.add_ingredient("pollution-create-processor", { type = "item", name = "solder", amount = 1 }) bobmods.lib.recipe.add_ingredient("speed-processor-2", { type = "item", name = "solder", amount = 2 }) - bobmods.lib.recipe.add_ingredient("effectivity-processor-2", { type = "item", name = "solder", amount = 2 }) + bobmods.lib.recipe.add_ingredient("efficiency-processor-2", { type = "item", name = "solder", amount = 2 }) bobmods.lib.recipe.add_ingredient("productivity-processor-2", { type = "item", name = "solder", amount = 2 }) bobmods.lib.recipe.add_ingredient("pollution-clean-processor-2", { type = "item", name = "solder", amount = 2 }) bobmods.lib.recipe.add_ingredient("pollution-create-processor-2", { type = "item", name = "solder", amount = 2 }) bobmods.lib.recipe.add_ingredient("speed-processor-3", { type = "item", name = "solder", amount = 3 }) - bobmods.lib.recipe.add_ingredient("effectivity-processor-3", { type = "item", name = "solder", amount = 3 }) + bobmods.lib.recipe.add_ingredient("efficiency-processor-3", { type = "item", name = "solder", amount = 3 }) bobmods.lib.recipe.add_ingredient("productivity-processor-3", { type = "item", name = "solder", amount = 3 }) bobmods.lib.recipe.add_ingredient("pollution-clean-processor-3", { type = "item", name = "solder", amount = 3 }) bobmods.lib.recipe.add_ingredient("pollution-create-processor-3", { type = "item", name = "solder", amount = 3 }) @@ -166,7 +166,7 @@ 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") 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("efficiency-module", "efficiency-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") diff --git a/bobmodules/prototypes/recipe/electronics.lua b/bobmodules/prototypes/recipe/electronics.lua index 48d48027..d011171f 100644 --- a/bobmodules/prototypes/recipe/electronics.lua +++ b/bobmodules/prototypes/recipe/electronics.lua @@ -120,7 +120,7 @@ data:extend({ data:extend({ { type = "recipe", - name = "effectivity-processor", + name = "efficiency-processor", energy_required = 2.5, enabled = false, ingredients = { @@ -128,12 +128,12 @@ data:extend({ { type = "item", name = "electronic-circuit", amount = 2 }, { type = "item", name = "advanced-circuit", amount = 2 }, }, - results = { { type = "item", name = "effectivity-processor", amount = 1 } }, + results = { { type = "item", name = "efficiency-processor", amount = 1 } }, }, { type = "recipe", - name = "effectivity-processor-2", + name = "efficiency-processor-2", energy_required = 5, enabled = false, ingredients = { @@ -141,19 +141,19 @@ data:extend({ { type = "item", name = "advanced-circuit", amount = 2 }, { type = "item", name = "processing-unit", amount = 2 }, }, - results = { { type = "item", name = "effectivity-processor-2", amount = 1 } }, + results = { { type = "item", name = "efficiency-processor-2", amount = 1 } }, }, { type = "recipe", - name = "effectivity-processor-3", + name = "efficiency-processor-3", energy_required = 7.5, enabled = false, ingredients = { { type = "item", name = "module-processor-board-3", amount = 1 }, { type = "item", name = "processing-unit", amount = 2 }, }, - results = { { type = "item", name = "effectivity-processor-3", amount = 1 } }, + results = { { type = "item", name = "efficiency-processor-3", amount = 1 } }, }, }) diff --git a/bobmodules/prototypes/recipe/module-merged.lua b/bobmodules/prototypes/recipe/module-merged.lua index bcc5a8a3..d937d317 100644 --- a/bobmodules/prototypes/recipe/module-merged.lua +++ b/bobmodules/prototypes/recipe/module-merged.lua @@ -8,7 +8,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then enabled = false, ingredients = { { type = "item", name = "speed-processor", amount = 1 }, - { type = "item", name = "effectivity-processor", amount = 1 }, + { type = "item", name = "efficiency-processor", amount = 1 }, { type = "item", name = "module-case", amount = 1 }, { type = "item", name = "module-circuit-board", amount = 1 }, { type = "item", name = "module-contact", amount = 4 }, @@ -24,7 +24,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then ingredients = { { type = "item", name = "raw-speed-module-1", amount = 1 }, { type = "item", name = "speed-processor", amount = 2 }, - { type = "item", name = "effectivity-processor", amount = 2 }, + { type = "item", name = "efficiency-processor", amount = 2 }, { type = "item", name = "module-contact", amount = 5 }, }, energy_required = 30, @@ -38,7 +38,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then ingredients = { { type = "item", name = "raw-speed-module-2", amount = 1 }, { type = "item", name = "speed-processor-2", amount = 3 }, - { type = "item", name = "effectivity-processor-2", amount = 3 }, + { type = "item", name = "efficiency-processor-2", amount = 3 }, { type = "item", name = "advanced-circuit", amount = 7 }, }, energy_required = 45, @@ -52,7 +52,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then ingredients = { { type = "item", name = "raw-speed-module-3", amount = 1 }, { type = "item", name = "speed-processor-2", amount = 4 }, - { type = "item", name = "effectivity-processor-2", amount = 4 }, + { type = "item", name = "efficiency-processor-2", amount = 4 }, { type = "item", name = "module-contact", amount = 5 }, { type = "item", name = "processing-unit", amount = 7 }, }, @@ -67,7 +67,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then ingredients = { { type = "item", name = "raw-speed-module-4", amount = 1 }, { type = "item", name = "speed-processor-2", amount = 5 }, - { type = "item", name = "effectivity-processor-2", amount = 5 }, + { type = "item", name = "efficiency-processor-2", amount = 5 }, { type = "item", name = "module-contact", amount = 5 }, { type = "item", name = "processing-unit", amount = 7 }, }, @@ -82,7 +82,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then ingredients = { { type = "item", name = "raw-speed-module-5", amount = 1 }, { type = "item", name = "speed-processor-3", amount = 6 }, - { type = "item", name = "effectivity-processor-3", amount = 6 }, + { type = "item", name = "efficiency-processor-3", amount = 6 }, { type = "item", name = "module-contact", amount = 5 }, { type = "item", name = "processing-unit", amount = 7 }, }, @@ -97,7 +97,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then ingredients = { { type = "item", name = "raw-speed-module-6", amount = 1 }, { type = "item", name = "speed-processor-3", amount = 8 }, - { type = "item", name = "effectivity-processor-3", amount = 8 }, + { type = "item", name = "efficiency-processor-3", amount = 8 }, { type = "item", name = "module-contact", amount = 5 }, { type = "item", name = "processing-unit", amount = 8 }, }, @@ -112,7 +112,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then ingredients = { { type = "item", name = "raw-speed-module-7", amount = 1 }, { type = "item", name = "speed-processor-3", amount = 10 }, - { type = "item", name = "effectivity-processor-3", amount = 10 }, + { type = "item", name = "efficiency-processor-3", amount = 10 }, { type = "item", name = "module-contact", amount = 5 }, { type = "item", name = "advanced-circuit", amount = 8 }, { type = "item", name = "processing-unit", amount = 8 }, @@ -132,7 +132,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then enabled = false, ingredients = { { type = "item", name = "speed-module", amount = 1 }, - { type = "item", name = "effectivity-module", amount = 1 }, + { type = "item", name = "efficiency-module", amount = 1 }, }, energy_required = 15, allow_as_intermediate = false, @@ -146,7 +146,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then enabled = false, ingredients = { { type = "item", name = "speed-module-2", amount = 1 }, - { type = "item", name = "effectivity-module-2", amount = 1 }, + { type = "item", name = "efficiency-module-2", amount = 1 }, }, energy_required = 30, allow_as_intermediate = false, @@ -160,7 +160,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then enabled = false, ingredients = { { type = "item", name = "speed-module-3", amount = 1 }, - { type = "item", name = "effectivity-module-3", amount = 1 }, + { type = "item", name = "efficiency-module-3", amount = 1 }, }, energy_required = 45, allow_as_intermediate = false, @@ -174,7 +174,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then enabled = false, ingredients = { { type = "item", name = "speed-module-4", amount = 1 }, - { type = "item", name = "effectivity-module-4", amount = 1 }, + { type = "item", name = "efficiency-module-4", amount = 1 }, }, energy_required = 60, allow_as_intermediate = false, @@ -188,7 +188,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then enabled = false, ingredients = { { type = "item", name = "speed-module-5", amount = 1 }, - { type = "item", name = "effectivity-module-5", amount = 1 }, + { type = "item", name = "efficiency-module-5", amount = 1 }, }, energy_required = 75, allow_as_intermediate = false, @@ -202,7 +202,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then enabled = false, ingredients = { { type = "item", name = "speed-module-6", amount = 1 }, - { type = "item", name = "effectivity-module-6", amount = 1 }, + { type = "item", name = "efficiency-module-6", amount = 1 }, }, energy_required = 90, allow_as_intermediate = false, @@ -216,7 +216,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then enabled = false, ingredients = { { type = "item", name = "speed-module-7", amount = 1 }, - { type = "item", name = "effectivity-module-7", amount = 1 }, + { type = "item", name = "efficiency-module-7", amount = 1 }, }, energy_required = 105, allow_as_intermediate = false, @@ -230,7 +230,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then enabled = false, ingredients = { { type = "item", name = "speed-module-8", amount = 1 }, - { type = "item", name = "effectivity-module-8", amount = 1 }, + { type = "item", name = "efficiency-module-8", amount = 1 }, }, energy_required = 120, allow_as_intermediate = false, @@ -248,7 +248,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then name = "green-module-1", enabled = false, ingredients = { - { type = "item", name = "effectivity-processor", amount = 1 }, + { type = "item", name = "efficiency-processor", amount = 1 }, { type = "item", name = "pollution-clean-processor", amount = 1 }, { type = "item", name = "module-case", amount = 1 }, { type = "item", name = "module-circuit-board", amount = 1 }, @@ -264,7 +264,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then enabled = false, ingredients = { { type = "item", name = "green-module-1", amount = 1 }, - { type = "item", name = "effectivity-processor", amount = 2 }, + { type = "item", name = "efficiency-processor", amount = 2 }, { type = "item", name = "pollution-clean-processor", amount = 2 }, { type = "item", name = "module-contact", amount = 5 }, }, @@ -278,7 +278,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then enabled = false, ingredients = { { type = "item", name = "green-module-2", amount = 1 }, - { type = "item", name = "effectivity-processor-2", amount = 3 }, + { type = "item", name = "efficiency-processor-2", amount = 3 }, { type = "item", name = "pollution-clean-processor-2", amount = 3 }, { type = "item", name = "advanced-circuit", amount = 7 }, }, @@ -292,7 +292,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then enabled = false, ingredients = { { type = "item", name = "green-module-3", amount = 1 }, - { type = "item", name = "effectivity-processor-2", amount = 4 }, + { type = "item", name = "efficiency-processor-2", amount = 4 }, { type = "item", name = "pollution-clean-processor-2", amount = 4 }, { type = "item", name = "module-contact", amount = 5 }, { type = "item", name = "processing-unit", amount = 7 }, @@ -307,7 +307,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then enabled = false, ingredients = { { type = "item", name = "green-module-4", amount = 1 }, - { type = "item", name = "effectivity-processor-2", amount = 5 }, + { type = "item", name = "efficiency-processor-2", amount = 5 }, { type = "item", name = "pollution-clean-processor-2", amount = 5 }, { type = "item", name = "module-contact", amount = 5 }, { type = "item", name = "processing-unit", amount = 7 }, @@ -322,7 +322,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then enabled = false, ingredients = { { type = "item", name = "green-module-5", amount = 1 }, - { type = "item", name = "effectivity-processor-3", amount = 6 }, + { type = "item", name = "efficiency-processor-3", amount = 6 }, { type = "item", name = "pollution-clean-processor-3", amount = 6 }, { type = "item", name = "module-contact", amount = 5 }, { type = "item", name = "processing-unit", amount = 7 }, @@ -337,7 +337,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then enabled = false, ingredients = { { type = "item", name = "green-module-6", amount = 1 }, - { type = "item", name = "effectivity-processor-3", amount = 8 }, + { type = "item", name = "efficiency-processor-3", amount = 8 }, { type = "item", name = "pollution-clean-processor-3", amount = 8 }, { type = "item", name = "module-contact", amount = 5 }, { type = "item", name = "processing-unit", amount = 8 }, @@ -352,7 +352,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then enabled = false, ingredients = { { type = "item", name = "green-module-7", amount = 1 }, - { type = "item", name = "effectivity-processor-3", amount = 10 }, + { type = "item", name = "efficiency-processor-3", amount = 10 }, { type = "item", name = "pollution-clean-processor-3", amount = 10 }, { type = "item", name = "module-contact", amount = 5 }, { type = "item", name = "advanced-circuit", amount = 8 }, @@ -372,7 +372,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then subgroup = "green-module-combine", enabled = false, ingredients = { - { type = "item", name = "effectivity-module", amount = 1 }, + { type = "item", name = "efficiency-module", amount = 1 }, { type = "item", name = "pollution-clean-module-1", amount = 1 }, }, energy_required = 15, @@ -386,7 +386,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then subgroup = "green-module-combine", enabled = false, ingredients = { - { type = "item", name = "effectivity-module-2", amount = 1 }, + { type = "item", name = "efficiency-module-2", amount = 1 }, { type = "item", name = "pollution-clean-module-2", amount = 1 }, }, energy_required = 30, @@ -400,7 +400,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then subgroup = "green-module-combine", enabled = false, ingredients = { - { type = "item", name = "effectivity-module-3", amount = 1 }, + { type = "item", name = "efficiency-module-3", amount = 1 }, { type = "item", name = "pollution-clean-module-3", amount = 1 }, }, energy_required = 45, @@ -414,7 +414,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then subgroup = "green-module-combine", enabled = false, ingredients = { - { type = "item", name = "effectivity-module-4", amount = 1 }, + { type = "item", name = "efficiency-module-4", amount = 1 }, { type = "item", name = "pollution-clean-module-4", amount = 1 }, }, energy_required = 60, @@ -428,7 +428,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then subgroup = "green-module-combine", enabled = false, ingredients = { - { type = "item", name = "effectivity-module-5", amount = 1 }, + { type = "item", name = "efficiency-module-5", amount = 1 }, { type = "item", name = "pollution-clean-module-5", amount = 1 }, }, energy_required = 75, @@ -442,7 +442,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then subgroup = "green-module-combine", enabled = false, ingredients = { - { type = "item", name = "effectivity-module-6", amount = 1 }, + { type = "item", name = "efficiency-module-6", amount = 1 }, { type = "item", name = "pollution-clean-module-6", amount = 1 }, }, energy_required = 90, @@ -456,7 +456,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then subgroup = "green-module-combine", enabled = false, ingredients = { - { type = "item", name = "effectivity-module-7", amount = 1 }, + { type = "item", name = "efficiency-module-7", amount = 1 }, { type = "item", name = "pollution-clean-module-7", amount = 1 }, }, energy_required = 105, @@ -470,7 +470,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then subgroup = "green-module-combine", enabled = false, ingredients = { - { type = "item", name = "effectivity-module-8", amount = 1 }, + { type = "item", name = "efficiency-module-8", amount = 1 }, { type = "item", name = "pollution-clean-module-8", amount = 1 }, }, energy_required = 120, @@ -490,7 +490,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru enabled = false, ingredients = { { type = "item", name = "productivity-processor", amount = 1 }, - { type = "item", name = "effectivity-processor", amount = 1 }, + { type = "item", name = "efficiency-processor", amount = 1 }, { type = "item", name = "pollution-clean-processor", amount = 1 }, { type = "item", name = "module-case", amount = 1 }, { type = "item", name = "module-circuit-board", amount = 1 }, @@ -507,7 +507,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru ingredients = { { type = "item", name = "raw-productivity-module-1", amount = 1 }, { type = "item", name = "productivity-processor", amount = 2 }, - { type = "item", name = "effectivity-processor", amount = 2 }, + { type = "item", name = "efficiency-processor", amount = 2 }, { type = "item", name = "pollution-clean-processor", amount = 2 }, { type = "item", name = "module-contact", amount = 5 }, }, @@ -522,7 +522,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru ingredients = { { type = "item", name = "raw-productivity-module-2", amount = 1 }, { type = "item", name = "productivity-processor-2", amount = 3 }, - { type = "item", name = "effectivity-processor-2", amount = 3 }, + { type = "item", name = "efficiency-processor-2", amount = 3 }, { type = "item", name = "pollution-clean-processor-2", amount = 3 }, { type = "item", name = "advanced-circuit", amount = 7 }, }, @@ -537,7 +537,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru ingredients = { { type = "item", name = "raw-productivity-module-3", amount = 1 }, { type = "item", name = "productivity-processor-2", amount = 4 }, - { type = "item", name = "effectivity-processor-2", amount = 4 }, + { type = "item", name = "efficiency-processor-2", amount = 4 }, { type = "item", name = "pollution-clean-processor-2", amount = 4 }, { type = "item", name = "module-contact", amount = 5 }, { type = "item", name = "processing-unit", amount = 7 }, @@ -553,7 +553,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru ingredients = { { type = "item", name = "raw-productivity-module-4", amount = 1 }, { type = "item", name = "productivity-processor-2", amount = 5 }, - { type = "item", name = "effectivity-processor-2", amount = 5 }, + { type = "item", name = "efficiency-processor-2", amount = 5 }, { type = "item", name = "pollution-clean-processor-2", amount = 5 }, { type = "item", name = "module-contact", amount = 5 }, { type = "item", name = "processing-unit", amount = 7 }, @@ -569,7 +569,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru ingredients = { { type = "item", name = "raw-productivity-module-5", amount = 1 }, { type = "item", name = "productivity-processor-3", amount = 6 }, - { type = "item", name = "effectivity-processor-3", amount = 6 }, + { type = "item", name = "efficiency-processor-3", amount = 6 }, { type = "item", name = "pollution-clean-processor-3", amount = 6 }, { type = "item", name = "module-contact", amount = 5 }, { type = "item", name = "processing-unit", amount = 7 }, @@ -585,7 +585,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru ingredients = { { type = "item", name = "raw-productivity-module-6", amount = 1 }, { type = "item", name = "productivity-processor-3", amount = 8 }, - { type = "item", name = "effectivity-processor-3", amount = 8 }, + { type = "item", name = "efficiency-processor-3", amount = 8 }, { type = "item", name = "pollution-clean-processor-3", amount = 8 }, { type = "item", name = "module-contact", amount = 5 }, { type = "item", name = "processing-unit", amount = 8 }, @@ -601,7 +601,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru ingredients = { { type = "item", name = "raw-productivity-module-7", amount = 1 }, { type = "item", name = "productivity-processor-3", amount = 10 }, - { type = "item", name = "effectivity-processor-3", amount = 10 }, + { type = "item", name = "efficiency-processor-3", amount = 10 }, { type = "item", name = "pollution-clean-processor-3", amount = 10 }, { type = "item", name = "module-contact", amount = 5 }, { type = "item", name = "advanced-circuit", amount = 8 }, @@ -622,7 +622,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru enabled = false, ingredients = { { type = "item", name = "productivity-module", amount = 1 }, - { type = "item", name = "effectivity-module", amount = 1 }, + { type = "item", name = "efficiency-module", amount = 1 }, { type = "item", name = "pollution-clean-module-1", amount = 1 }, }, energy_required = 15, @@ -637,7 +637,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru enabled = false, ingredients = { { type = "item", name = "productivity-module-2", amount = 1 }, - { type = "item", name = "effectivity-module-2", amount = 1 }, + { type = "item", name = "efficiency-module-2", amount = 1 }, { type = "item", name = "pollution-clean-module-2", amount = 1 }, }, energy_required = 30, @@ -652,7 +652,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru enabled = false, ingredients = { { type = "item", name = "productivity-module-3", amount = 1 }, - { type = "item", name = "effectivity-module-3", amount = 1 }, + { type = "item", name = "efficiency-module-3", amount = 1 }, { type = "item", name = "pollution-clean-module-3", amount = 1 }, }, energy_required = 45, @@ -667,7 +667,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru enabled = false, ingredients = { { type = "item", name = "productivity-module-4", amount = 1 }, - { type = "item", name = "effectivity-module-4", amount = 1 }, + { type = "item", name = "efficiency-module-4", amount = 1 }, { type = "item", name = "pollution-clean-module-4", amount = 1 }, }, energy_required = 60, @@ -682,7 +682,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru enabled = false, ingredients = { { type = "item", name = "productivity-module-5", amount = 1 }, - { type = "item", name = "effectivity-module-5", amount = 1 }, + { type = "item", name = "efficiency-module-5", amount = 1 }, { type = "item", name = "pollution-clean-module-5", amount = 1 }, }, energy_required = 75, @@ -697,7 +697,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru enabled = false, ingredients = { { type = "item", name = "productivity-module-6", amount = 1 }, - { type = "item", name = "effectivity-module-6", amount = 1 }, + { type = "item", name = "efficiency-module-6", amount = 1 }, { type = "item", name = "pollution-clean-module-6", amount = 1 }, }, energy_required = 90, @@ -712,7 +712,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru enabled = false, ingredients = { { type = "item", name = "productivity-module-7", amount = 1 }, - { type = "item", name = "effectivity-module-7", amount = 1 }, + { type = "item", name = "efficiency-module-7", amount = 1 }, { type = "item", name = "pollution-clean-module-7", amount = 1 }, }, energy_required = 105, @@ -727,7 +727,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru enabled = false, ingredients = { { type = "item", name = "productivity-module-8", amount = 1 }, - { type = "item", name = "effectivity-module-8", amount = 1 }, + { type = "item", name = "efficiency-module-8", amount = 1 }, { type = "item", name = "pollution-clean-module-8", amount = 1 }, }, energy_required = 120, @@ -746,7 +746,7 @@ if settings.startup["bobmods-modules-enablegodmodules"].value == true then ingredients = { { type = "item", name = "speed-processor", amount = 2 }, { type = "item", name = "productivity-processor", amount = 2 }, - { type = "item", name = "effectivity-processor", amount = 6 }, + { type = "item", name = "efficiency-processor", amount = 6 }, { type = "item", name = "pollution-clean-processor", amount = 4 }, { type = "item", name = "module-case", amount = 1 }, { type = "item", name = "module-circuit-board", amount = 1 }, @@ -764,7 +764,7 @@ if settings.startup["bobmods-modules-enablegodmodules"].value == true then { type = "item", name = "god-module-1", amount = 1 }, { type = "item", name = "speed-processor-2", amount = 4 }, { type = "item", name = "productivity-processor-2", amount = 4 }, - { type = "item", name = "effectivity-processor-2", amount = 12 }, + { type = "item", name = "efficiency-processor-2", amount = 12 }, { type = "item", name = "pollution-clean-processor-2", amount = 8 }, { type = "item", name = "module-contact", amount = 5 }, { type = "item", name = "advanced-circuit", amount = 7 }, @@ -782,7 +782,7 @@ if settings.startup["bobmods-modules-enablegodmodules"].value == true then { type = "item", name = "god-module-2", amount = 1 }, { type = "item", name = "speed-processor-3", amount = 6 }, { type = "item", name = "productivity-processor-3", amount = 6 }, - { type = "item", name = "effectivity-processor-3", amount = 18 }, + { type = "item", name = "efficiency-processor-3", amount = 18 }, { type = "item", name = "pollution-clean-processor-3", amount = 12 }, { type = "item", name = "module-contact", amount = 5 }, { type = "item", name = "processing-unit", amount = 7 }, @@ -799,7 +799,7 @@ if settings.startup["bobmods-modules-enablegodmodules"].value == true then { type = "item", name = "god-module-3", amount = 1 }, { type = "item", name = "speed-processor-3", amount = 10 }, { type = "item", name = "productivity-processor-3", amount = 10 }, - { type = "item", name = "effectivity-processor-3", amount = 30 }, + { type = "item", name = "efficiency-processor-3", amount = 30 }, { type = "item", name = "pollution-clean-processor-3", amount = 20 }, { type = "item", name = "module-contact", amount = 5 }, { type = "item", name = "advanced-circuit", amount = 8 }, @@ -817,7 +817,7 @@ if settings.startup["bobmods-modules-enablegodmodules"].value == true then { type = "item", name = "god-module-4", amount = 1 }, { type = "item", name = "speed-processor-3", amount = 15 }, { type = "item", name = "productivity-processor-3", amount = 15 }, - { type = "item", name = "effectivity-processor-3", amount = 45 }, + { type = "item", name = "efficiency-processor-3", amount = 45 }, { type = "item", name = "pollution-clean-processor-3", amount = 30 }, { type = "item", name = "module-contact", amount = 5 }, { type = "item", name = "advanced-circuit", amount = 10 }, diff --git a/bobmodules/prototypes/recipe/module-updates.lua b/bobmodules/prototypes/recipe/module-updates.lua index 76c97996..82e93940 100644 --- a/bobmodules/prototypes/recipe/module-updates.lua +++ b/bobmodules/prototypes/recipe/module-updates.lua @@ -1,48 +1,48 @@ if data.raw.item["solder"] then bobmods.lib.recipe.add_ingredient("speed-module-2", { type = "item", name = "solder", amount = 1 }) - bobmods.lib.recipe.add_ingredient("effectivity-module-2", { type = "item", name = "solder", amount = 1 }) + bobmods.lib.recipe.add_ingredient("efficiency-module-2", { type = "item", name = "solder", amount = 1 }) bobmods.lib.recipe.add_ingredient("productivity-module-2", { type = "item", name = "solder", amount = 1 }) bobmods.lib.recipe.add_ingredient("pollution-clean-module-2", { type = "item", name = "solder", amount = 1 }) bobmods.lib.recipe.add_ingredient("pollution-create-module-2", { type = "item", name = "solder", amount = 1 }) bobmods.lib.recipe.add_ingredient("speed-module-3", { type = "item", name = "solder", amount = 2 }) - bobmods.lib.recipe.add_ingredient("effectivity-module-3", { type = "item", name = "solder", amount = 2 }) + bobmods.lib.recipe.add_ingredient("efficiency-module-3", { type = "item", name = "solder", amount = 2 }) bobmods.lib.recipe.add_ingredient("productivity-module-3", { type = "item", name = "solder", amount = 2 }) bobmods.lib.recipe.add_ingredient("pollution-clean-module-3", { type = "item", name = "solder", amount = 2 }) bobmods.lib.recipe.add_ingredient("pollution-create-module-3", { type = "item", name = "solder", amount = 2 }) bobmods.lib.recipe.add_ingredient("speed-module-4", { type = "item", name = "solder", amount = 3 }) - bobmods.lib.recipe.add_ingredient("effectivity-module-4", { type = "item", name = "solder", amount = 3 }) + bobmods.lib.recipe.add_ingredient("efficiency-module-4", { type = "item", name = "solder", amount = 3 }) bobmods.lib.recipe.add_ingredient("productivity-module-4", { type = "item", name = "solder", amount = 3 }) bobmods.lib.recipe.add_ingredient("pollution-clean-module-4", { type = "item", name = "solder", amount = 3 }) bobmods.lib.recipe.add_ingredient("pollution-create-module-4", { type = "item", name = "solder", amount = 3 }) bobmods.lib.recipe.add_ingredient("speed-module-5", { type = "item", name = "solder", amount = 4 }) - bobmods.lib.recipe.add_ingredient("effectivity-module-5", { type = "item", name = "solder", amount = 4 }) + bobmods.lib.recipe.add_ingredient("efficiency-module-5", { type = "item", name = "solder", amount = 4 }) bobmods.lib.recipe.add_ingredient("productivity-module-5", { type = "item", name = "solder", amount = 4 }) bobmods.lib.recipe.add_ingredient("pollution-clean-module-5", { type = "item", name = "solder", amount = 4 }) bobmods.lib.recipe.add_ingredient("pollution-create-module-5", { type = "item", name = "solder", amount = 4 }) bobmods.lib.recipe.add_ingredient("speed-module-6", { type = "item", name = "solder", amount = 5 }) - bobmods.lib.recipe.add_ingredient("effectivity-module-6", { type = "item", name = "solder", amount = 5 }) + bobmods.lib.recipe.add_ingredient("efficiency-module-6", { type = "item", name = "solder", amount = 5 }) bobmods.lib.recipe.add_ingredient("productivity-module-6", { type = "item", name = "solder", amount = 5 }) bobmods.lib.recipe.add_ingredient("pollution-clean-module-6", { type = "item", name = "solder", amount = 5 }) bobmods.lib.recipe.add_ingredient("pollution-create-module-6", { type = "item", name = "solder", amount = 5 }) bobmods.lib.recipe.add_ingredient("speed-module-7", { type = "item", name = "solder", amount = 7 }) - bobmods.lib.recipe.add_ingredient("effectivity-module-7", { type = "item", name = "solder", amount = 7 }) + bobmods.lib.recipe.add_ingredient("efficiency-module-7", { type = "item", name = "solder", amount = 7 }) bobmods.lib.recipe.add_ingredient("productivity-module-7", { type = "item", name = "solder", amount = 7 }) bobmods.lib.recipe.add_ingredient("pollution-clean-module-7", { type = "item", name = "solder", amount = 7 }) bobmods.lib.recipe.add_ingredient("pollution-create-module-7", { type = "item", name = "solder", amount = 7 }) bobmods.lib.recipe.add_ingredient("speed-module-8", { type = "item", name = "solder", amount = 8 }) - bobmods.lib.recipe.add_ingredient("effectivity-module-8", { type = "item", name = "solder", amount = 8 }) + bobmods.lib.recipe.add_ingredient("efficiency-module-8", { type = "item", name = "solder", amount = 8 }) bobmods.lib.recipe.add_ingredient("productivity-module-8", { type = "item", name = "solder", amount = 8 }) bobmods.lib.recipe.add_ingredient("pollution-clean-module-8", { type = "item", name = "solder", amount = 8 }) bobmods.lib.recipe.add_ingredient("pollution-create-module-8", { type = "item", name = "solder", amount = 8 }) else bobmods.lib.recipe.add_ingredient("speed-module-3", { type = "item", name = "module-contact", amount = 5 }) - bobmods.lib.recipe.add_ingredient("effectivity-module-3", { type = "item", name = "module-contact", amount = 5 }) + bobmods.lib.recipe.add_ingredient("efficiency-module-3", { type = "item", name = "module-contact", amount = 5 }) bobmods.lib.recipe.add_ingredient("productivity-module-3", { type = "item", name = "module-contact", amount = 5 }) bobmods.lib.recipe.add_ingredient("pollution-clean-module-3", { type = "item", name = "module-contact", amount = 5 }) bobmods.lib.recipe.add_ingredient("pollution-create-module-3", { type = "item", name = "module-contact", amount = 5 }) @@ -50,13 +50,13 @@ end if data.raw.item["electronic-components"] then bobmods.lib.recipe.replace_ingredient("speed-module-3", "advanced-circuit", "electronic-components") - bobmods.lib.recipe.replace_ingredient("effectivity-module-3", "advanced-circuit", "electronic-components") + bobmods.lib.recipe.replace_ingredient("efficiency-module-3", "advanced-circuit", "electronic-components") bobmods.lib.recipe.replace_ingredient("productivity-module-3", "advanced-circuit", "electronic-components") bobmods.lib.recipe.replace_ingredient("pollution-clean-module-3", "advanced-circuit", "electronic-components") bobmods.lib.recipe.replace_ingredient("pollution-create-module-3", "advanced-circuit", "electronic-components") bobmods.lib.recipe.replace_ingredient("speed-module-8", "advanced-circuit", "electronic-components") - bobmods.lib.recipe.replace_ingredient("effectivity-module-8", "advanced-circuit", "electronic-components") + bobmods.lib.recipe.replace_ingredient("efficiency-module-8", "advanced-circuit", "electronic-components") bobmods.lib.recipe.replace_ingredient("productivity-module-8", "advanced-circuit", "electronic-components") bobmods.lib.recipe.replace_ingredient("pollution-clean-module-8", "advanced-circuit", "electronic-components") bobmods.lib.recipe.replace_ingredient("pollution-create-module-8", "advanced-circuit", "electronic-components") @@ -64,31 +64,31 @@ end if data.raw.item["intergrated-electronics"] then bobmods.lib.recipe.replace_ingredient("speed-module-4", "processing-unit", "intergrated-electronics") - bobmods.lib.recipe.replace_ingredient("effectivity-module-4", "processing-unit", "intergrated-electronics") + bobmods.lib.recipe.replace_ingredient("efficiency-module-4", "processing-unit", "intergrated-electronics") bobmods.lib.recipe.replace_ingredient("productivity-module-4", "processing-unit", "intergrated-electronics") bobmods.lib.recipe.replace_ingredient("pollution-clean-module-4", "processing-unit", "intergrated-electronics") bobmods.lib.recipe.replace_ingredient("pollution-create-module-4", "processing-unit", "intergrated-electronics") bobmods.lib.recipe.replace_ingredient("speed-module-5", "processing-unit", "intergrated-electronics") - bobmods.lib.recipe.replace_ingredient("effectivity-module-5", "processing-unit", "intergrated-electronics") + bobmods.lib.recipe.replace_ingredient("efficiency-module-5", "processing-unit", "intergrated-electronics") bobmods.lib.recipe.replace_ingredient("productivity-module-5", "processing-unit", "intergrated-electronics") bobmods.lib.recipe.replace_ingredient("pollution-clean-module-5", "processing-unit", "intergrated-electronics") bobmods.lib.recipe.replace_ingredient("pollution-create-module-5", "processing-unit", "intergrated-electronics") bobmods.lib.recipe.replace_ingredient("speed-module-6", "processing-unit", "intergrated-electronics") - bobmods.lib.recipe.replace_ingredient("effectivity-module-6", "processing-unit", "intergrated-electronics") + bobmods.lib.recipe.replace_ingredient("efficiency-module-6", "processing-unit", "intergrated-electronics") bobmods.lib.recipe.replace_ingredient("productivity-module-6", "processing-unit", "intergrated-electronics") bobmods.lib.recipe.replace_ingredient("pollution-clean-module-6", "processing-unit", "intergrated-electronics") bobmods.lib.recipe.replace_ingredient("pollution-create-module-6", "processing-unit", "intergrated-electronics") bobmods.lib.recipe.replace_ingredient("speed-module-7", "processing-unit", "intergrated-electronics") - bobmods.lib.recipe.replace_ingredient("effectivity-module-7", "processing-unit", "intergrated-electronics") + bobmods.lib.recipe.replace_ingredient("efficiency-module-7", "processing-unit", "intergrated-electronics") bobmods.lib.recipe.replace_ingredient("productivity-module-7", "processing-unit", "intergrated-electronics") bobmods.lib.recipe.replace_ingredient("pollution-clean-module-7", "processing-unit", "intergrated-electronics") bobmods.lib.recipe.replace_ingredient("pollution-create-module-7", "processing-unit", "intergrated-electronics") bobmods.lib.recipe.replace_ingredient("speed-module-8", "processing-unit", "intergrated-electronics") - bobmods.lib.recipe.replace_ingredient("effectivity-module-8", "processing-unit", "intergrated-electronics") + bobmods.lib.recipe.replace_ingredient("efficiency-module-8", "processing-unit", "intergrated-electronics") bobmods.lib.recipe.replace_ingredient("productivity-module-8", "processing-unit", "intergrated-electronics") bobmods.lib.recipe.replace_ingredient("pollution-clean-module-8", "processing-unit", "intergrated-electronics") bobmods.lib.recipe.replace_ingredient("pollution-create-module-8", "processing-unit", "intergrated-electronics") @@ -97,7 +97,7 @@ end if data.raw.item["processing-electronics"] then bobmods.lib.recipe.add_ingredient("speed-module-7", { type = "item", name = "processing-electronics", amount = 3 }) bobmods.lib.recipe.add_ingredient( - "effectivity-module-7", + "efficiency-module-7", { type = "item", name = "processing-electronics", amount = 3 } ) bobmods.lib.recipe.add_ingredient( @@ -115,7 +115,7 @@ if data.raw.item["processing-electronics"] then bobmods.lib.recipe.add_ingredient("speed-module-8", { type = "item", name = "processing-electronics", amount = 5 }) bobmods.lib.recipe.add_ingredient( - "effectivity-module-8", + "efficiency-module-8", { type = "item", name = "processing-electronics", amount = 5 } ) bobmods.lib.recipe.add_ingredient( @@ -137,7 +137,7 @@ else { type = "item", name = "advanced-processing-unit", amount = 3 } ) bobmods.lib.recipe.add_ingredient( - "effectivity-module-7", + "efficiency-module-7", { type = "item", name = "advanced-processing-unit", amount = 3 } ) bobmods.lib.recipe.add_ingredient( @@ -158,7 +158,7 @@ else { type = "item", name = "advanced-processing-unit", amount = 5 } ) bobmods.lib.recipe.add_ingredient( - "effectivity-module-8", + "efficiency-module-8", { type = "item", name = "advanced-processing-unit", amount = 5 } ) bobmods.lib.recipe.add_ingredient( @@ -175,7 +175,7 @@ else ) else bobmods.lib.recipe.add_ingredient("speed-module-7", { type = "item", name = "processing-unit", amount = 3 }) - bobmods.lib.recipe.add_ingredient("effectivity-module-7", { type = "item", name = "processing-unit", amount = 3 }) + bobmods.lib.recipe.add_ingredient("efficiency-module-7", { type = "item", name = "processing-unit", amount = 3 }) bobmods.lib.recipe.add_ingredient("productivity-module-7", { type = "item", name = "processing-unit", amount = 3 }) bobmods.lib.recipe.add_ingredient( "pollution-clean-module-7", @@ -187,7 +187,7 @@ else ) bobmods.lib.recipe.add_ingredient("speed-module-8", { type = "item", name = "processing-unit", amount = 5 }) - bobmods.lib.recipe.add_ingredient("effectivity-module-8", { type = "item", name = "processing-unit", amount = 5 }) + bobmods.lib.recipe.add_ingredient("efficiency-module-8", { type = "item", name = "processing-unit", amount = 5 }) bobmods.lib.recipe.add_ingredient("productivity-module-8", { type = "item", name = "processing-unit", amount = 5 }) bobmods.lib.recipe.add_ingredient( "pollution-clean-module-8", @@ -202,21 +202,21 @@ end if data.raw.item["ruby-5"] then bobmods.lib.recipe.add_ingredient("speed-module-5", { type = "item", name = "ruby-5", amount = 1 }) - bobmods.lib.recipe.add_ingredient("effectivity-module-5", { type = "item", name = "ruby-5", amount = 1 }) + bobmods.lib.recipe.add_ingredient("efficiency-module-5", { type = "item", name = "ruby-5", amount = 1 }) bobmods.lib.recipe.add_ingredient("productivity-module-5", { type = "item", name = "ruby-5", amount = 1 }) bobmods.lib.recipe.add_ingredient("pollution-clean-module-5", { type = "item", name = "ruby-5", amount = 1 }) bobmods.lib.recipe.add_ingredient("pollution-create-module-5", { type = "item", name = "ruby-5", amount = 1 }) if data.raw.technology["gem-processing-3"] then bobmods.lib.tech.add_prerequisite("speed-module-5", "gem-processing-3") bobmods.lib.tech.add_prerequisite("productivity-module-5", "gem-processing-3") - bobmods.lib.tech.add_prerequisite("effectivity-module-5", "gem-processing-3") + bobmods.lib.tech.add_prerequisite("efficiency-module-5", "gem-processing-3") bobmods.lib.tech.add_prerequisite("pollution-clean-module-5", "gem-processing-3") bobmods.lib.tech.add_prerequisite("pollution-create-module-5", "gem-processing-3") end else if data.raw.item["alien-artifact"] then bobmods.lib.recipe.add_ingredient("speed-module-5", { type = "item", name = "alien-artifact", amount = 1 }) - bobmods.lib.recipe.add_ingredient("effectivity-module-5", { type = "item", name = "alien-artifact", amount = 1 }) + bobmods.lib.recipe.add_ingredient("efficiency-module-5", { type = "item", name = "alien-artifact", amount = 1 }) bobmods.lib.recipe.add_ingredient("productivity-module-5", { type = "item", name = "alien-artifact", amount = 1 }) bobmods.lib.recipe.add_ingredient( "pollution-clean-module-5", @@ -231,14 +231,14 @@ end if data.raw.item["emerald-5"] then bobmods.lib.recipe.add_ingredient("speed-module-6", { type = "item", name = "emerald-5", amount = 1 }) - bobmods.lib.recipe.add_ingredient("effectivity-module-6", { type = "item", name = "emerald-5", amount = 1 }) + bobmods.lib.recipe.add_ingredient("efficiency-module-6", { type = "item", name = "emerald-5", amount = 1 }) bobmods.lib.recipe.add_ingredient("productivity-module-6", { type = "item", name = "emerald-5", amount = 1 }) bobmods.lib.recipe.add_ingredient("pollution-clean-module-6", { type = "item", name = "emerald-5", amount = 1 }) bobmods.lib.recipe.add_ingredient("pollution-create-module-6", { type = "item", name = "emerald-5", amount = 1 }) else if data.raw.item["alien-artifact"] then bobmods.lib.recipe.add_ingredient("speed-module-6", { type = "item", name = "alien-artifact", amount = 1 }) - bobmods.lib.recipe.add_ingredient("effectivity-module-6", { type = "item", name = "alien-artifact", amount = 1 }) + bobmods.lib.recipe.add_ingredient("efficiency-module-6", { type = "item", name = "alien-artifact", amount = 1 }) bobmods.lib.recipe.add_ingredient("productivity-module-6", { type = "item", name = "alien-artifact", amount = 1 }) bobmods.lib.recipe.add_ingredient( "pollution-clean-module-6", @@ -253,14 +253,14 @@ end if data.raw.item["topaz-5"] then bobmods.lib.recipe.add_ingredient("speed-module-7", { type = "item", name = "topaz-5", amount = 1 }) - bobmods.lib.recipe.add_ingredient("effectivity-module-7", { type = "item", name = "topaz-5", amount = 1 }) + bobmods.lib.recipe.add_ingredient("efficiency-module-7", { type = "item", name = "topaz-5", amount = 1 }) bobmods.lib.recipe.add_ingredient("productivity-module-7", { type = "item", name = "topaz-5", amount = 1 }) bobmods.lib.recipe.add_ingredient("pollution-clean-module-7", { type = "item", name = "topaz-5", amount = 1 }) bobmods.lib.recipe.add_ingredient("pollution-create-module-7", { type = "item", name = "topaz-5", amount = 1 }) else if data.raw.item["alien-artifact"] then bobmods.lib.recipe.add_ingredient("speed-module-7", { type = "item", name = "alien-artifact", amount = 1 }) - bobmods.lib.recipe.add_ingredient("effectivity-module-7", { type = "item", name = "alien-artifact", amount = 1 }) + bobmods.lib.recipe.add_ingredient("efficiency-module-7", { type = "item", name = "alien-artifact", amount = 1 }) bobmods.lib.recipe.add_ingredient("productivity-module-7", { type = "item", name = "alien-artifact", amount = 1 }) bobmods.lib.recipe.add_ingredient( "pollution-clean-module-7", @@ -275,14 +275,14 @@ end if data.raw.item["diamond-5"] then bobmods.lib.recipe.add_ingredient("speed-module-8", { type = "item", name = "diamond-5", amount = 1 }) - bobmods.lib.recipe.add_ingredient("effectivity-module-8", { type = "item", name = "diamond-5", amount = 1 }) + bobmods.lib.recipe.add_ingredient("efficiency-module-8", { type = "item", name = "diamond-5", amount = 1 }) bobmods.lib.recipe.add_ingredient("productivity-module-8", { type = "item", name = "diamond-5", amount = 1 }) bobmods.lib.recipe.add_ingredient("pollution-clean-module-8", { type = "item", name = "diamond-5", amount = 1 }) bobmods.lib.recipe.add_ingredient("pollution-create-module-8", { type = "item", name = "diamond-5", amount = 1 }) else if data.raw.item["alien-artifact"] then bobmods.lib.recipe.add_ingredient("speed-module-8", { type = "item", name = "alien-artifact", amount = 1 }) - bobmods.lib.recipe.add_ingredient("effectivity-module-8", { type = "item", name = "alien-artifact", amount = 1 }) + bobmods.lib.recipe.add_ingredient("efficiency-module-8", { type = "item", name = "alien-artifact", amount = 1 }) bobmods.lib.recipe.add_ingredient("productivity-module-8", { type = "item", name = "alien-artifact", amount = 1 }) bobmods.lib.recipe.add_ingredient( "pollution-clean-module-8", diff --git a/bobmodules/prototypes/recipe/module.lua b/bobmodules/prototypes/recipe/module.lua index f5e75449..9ba679f5 100644 --- a/bobmodules/prototypes/recipe/module.lua +++ b/bobmodules/prototypes/recipe/module.lua @@ -95,100 +95,100 @@ data:extend({ }, }) ---[[Effectivity Modules]] +--[[Efficiency Modules]] -- -data.raw["recipe"]["effectivity-module"].ingredients = { - { type = "item", name = "effectivity-processor", amount = 1 }, +data.raw["recipe"]["efficiency-module"].ingredients = { + { type = "item", name = "efficiency-processor", amount = 1 }, { type = "item", name = "module-case", amount = 1 }, { type = "item", name = "module-circuit-board", amount = 1 }, { type = "item", name = "module-contact", amount = 4 }, } -data.raw["recipe"]["effectivity-module"].energy_required = 10 +data.raw["recipe"]["efficiency-module"].energy_required = 10 -data.raw["recipe"]["effectivity-module-2"].ingredients = { - { type = "item", name = "effectivity-module", amount = 1 }, - { type = "item", name = "effectivity-processor", amount = 2 }, +data.raw["recipe"]["efficiency-module-2"].ingredients = { + { type = "item", name = "efficiency-module", amount = 1 }, + { type = "item", name = "efficiency-processor", amount = 2 }, { type = "item", name = "module-contact", amount = 5 }, } -data.raw["recipe"]["effectivity-module-2"].energy_required = 20 +data.raw["recipe"]["efficiency-module-2"].energy_required = 20 -data.raw["recipe"]["effectivity-module-3"].ingredients = { - { type = "item", name = "effectivity-module-2", amount = 1 }, - { type = "item", name = "effectivity-processor-2", amount = 3 }, +data.raw["recipe"]["efficiency-module-3"].ingredients = { + { type = "item", name = "efficiency-module-2", amount = 1 }, + { type = "item", name = "efficiency-processor-2", amount = 3 }, { type = "item", name = "advanced-circuit", amount = 5 }, } -data.raw["recipe"]["effectivity-module-3"].energy_required = 30 +data.raw["recipe"]["efficiency-module-3"].energy_required = 30 data:extend({ { type = "recipe", - name = "effectivity-module-4", + name = "efficiency-module-4", enabled = false, ingredients = { - { type = "item", name = "effectivity-module-3", amount = 1 }, - { type = "item", name = "effectivity-processor-2", amount = 4 }, + { type = "item", name = "efficiency-module-3", amount = 1 }, + { type = "item", name = "efficiency-processor-2", amount = 4 }, { type = "item", name = "module-contact", amount = 5 }, { type = "item", name = "processing-unit", amount = 5 }, }, energy_required = 40, - results = { { type = "item", name = "effectivity-module-4", amount = 1 } }, + results = { { type = "item", name = "efficiency-module-4", amount = 1 } }, }, { type = "recipe", - name = "effectivity-module-5", + name = "efficiency-module-5", enabled = false, ingredients = { - { type = "item", name = "effectivity-module-4", amount = 1 }, - { type = "item", name = "effectivity-processor-2", amount = 5 }, + { type = "item", name = "efficiency-module-4", amount = 1 }, + { type = "item", name = "efficiency-processor-2", amount = 5 }, { type = "item", name = "module-contact", amount = 5 }, { type = "item", name = "processing-unit", amount = 5 }, }, energy_required = 50, - results = { { type = "item", name = "effectivity-module-5", amount = 1 } }, + results = { { type = "item", name = "efficiency-module-5", amount = 1 } }, }, { type = "recipe", - name = "effectivity-module-6", + name = "efficiency-module-6", enabled = false, ingredients = { - { type = "item", name = "effectivity-module-5", amount = 1 }, - { type = "item", name = "effectivity-processor-3", amount = 6 }, + { type = "item", name = "efficiency-module-5", amount = 1 }, + { type = "item", name = "efficiency-processor-3", amount = 6 }, { type = "item", name = "module-contact", amount = 5 }, { type = "item", name = "processing-unit", amount = 5 }, }, energy_required = 60, - results = { { type = "item", name = "effectivity-module-6", amount = 1 } }, + results = { { type = "item", name = "efficiency-module-6", amount = 1 } }, }, { type = "recipe", - name = "effectivity-module-7", + name = "efficiency-module-7", enabled = false, ingredients = { - { type = "item", name = "effectivity-module-6", amount = 1 }, - { type = "item", name = "effectivity-processor-3", amount = 8 }, + { type = "item", name = "efficiency-module-6", amount = 1 }, + { type = "item", name = "efficiency-processor-3", amount = 8 }, { type = "item", name = "module-contact", amount = 5 }, { type = "item", name = "processing-unit", amount = 5 }, }, energy_required = 70, - results = { { type = "item", name = "effectivity-module-7", amount = 1 } }, + results = { { type = "item", name = "efficiency-module-7", amount = 1 } }, }, { type = "recipe", - name = "effectivity-module-8", + name = "efficiency-module-8", enabled = false, ingredients = { - { type = "item", name = "effectivity-module-7", amount = 1 }, - { type = "item", name = "effectivity-processor-3", amount = 10 }, + { type = "item", name = "efficiency-module-7", amount = 1 }, + { type = "item", name = "efficiency-processor-3", amount = 10 }, { type = "item", name = "module-contact", amount = 5 }, { type = "item", name = "advanced-circuit", amount = 5 }, { type = "item", name = "processing-unit", amount = 5 }, }, energy_required = 80, - results = { { type = "item", name = "effectivity-module-8", amount = 1 } }, + results = { { type = "item", name = "efficiency-module-8", amount = 1 } }, }, }) diff --git a/bobmodules/prototypes/technology/module-merged.lua b/bobmodules/prototypes/technology/module-merged.lua index 48061ee2..8c5bdacc 100644 --- a/bobmodules/prototypes/technology/module-merged.lua +++ b/bobmodules/prototypes/technology/module-merged.lua @@ -42,7 +42,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then recipe = "raw-speed-module-1-combine", }, }, - prerequisites = { "module-merging", "speed-module", "effectivity-module" }, + prerequisites = { "module-merging", "speed-module", "efficiency-module" }, unit = { count = 50, ingredients = { @@ -68,7 +68,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then recipe = "raw-speed-module-2-combine", }, }, - prerequisites = { "raw-speed-module-1", "speed-module-2", "effectivity-module-2" }, + prerequisites = { "raw-speed-module-1", "speed-module-2", "efficiency-module-2" }, unit = { count = 100, ingredients = { @@ -94,7 +94,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then recipe = "raw-speed-module-3-combine", }, }, - prerequisites = { "raw-speed-module-2", "speed-module-3", "effectivity-module-3" }, + prerequisites = { "raw-speed-module-2", "speed-module-3", "efficiency-module-3" }, unit = { count = 150, ingredients = { @@ -121,7 +121,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then recipe = "raw-speed-module-4-combine", }, }, - prerequisites = { "raw-speed-module-3", "speed-module-4", "effectivity-module-4" }, + prerequisites = { "raw-speed-module-3", "speed-module-4", "efficiency-module-4" }, unit = { count = 200, ingredients = { @@ -148,7 +148,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then recipe = "raw-speed-module-5-combine", }, }, - prerequisites = { "raw-speed-module-4", "speed-module-5", "effectivity-module-5" }, + prerequisites = { "raw-speed-module-4", "speed-module-5", "efficiency-module-5" }, unit = { count = 250, ingredients = { @@ -175,7 +175,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then recipe = "raw-speed-module-6-combine", }, }, - prerequisites = { "raw-speed-module-5", "speed-module-6", "effectivity-module-6" }, + prerequisites = { "raw-speed-module-5", "speed-module-6", "efficiency-module-6" }, unit = { count = 300, ingredients = { @@ -203,7 +203,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then recipe = "raw-speed-module-7-combine", }, }, - prerequisites = { "raw-speed-module-6", "speed-module-7", "effectivity-module-7" }, + prerequisites = { "raw-speed-module-6", "speed-module-7", "efficiency-module-7" }, unit = { count = 350, ingredients = { @@ -231,7 +231,7 @@ if settings.startup["bobmods-modules-enablerawspeedmodules"].value == true then recipe = "raw-speed-module-8-combine", }, }, - prerequisites = { "raw-speed-module-7", "speed-module-8", "effectivity-module-8" }, + prerequisites = { "raw-speed-module-7", "speed-module-8", "efficiency-module-8" }, unit = { count = 400, ingredients = { @@ -263,7 +263,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then recipe = "green-module-1-combine", }, }, - prerequisites = { "module-merging", "effectivity-module", "pollution-clean-module-1" }, + prerequisites = { "module-merging", "efficiency-module", "pollution-clean-module-1" }, unit = { count = 50, ingredients = { @@ -289,7 +289,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then recipe = "green-module-2-combine", }, }, - prerequisites = { "green-module-1", "effectivity-module-2", "pollution-clean-module-2" }, + prerequisites = { "green-module-1", "efficiency-module-2", "pollution-clean-module-2" }, unit = { count = 100, ingredients = { @@ -315,7 +315,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then recipe = "green-module-3-combine", }, }, - prerequisites = { "green-module-2", "effectivity-module-3", "pollution-clean-module-3" }, + prerequisites = { "green-module-2", "efficiency-module-3", "pollution-clean-module-3" }, unit = { count = 150, ingredients = { @@ -342,7 +342,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then recipe = "green-module-4-combine", }, }, - prerequisites = { "green-module-3", "effectivity-module-4", "pollution-clean-module-4" }, + prerequisites = { "green-module-3", "efficiency-module-4", "pollution-clean-module-4" }, unit = { count = 200, ingredients = { @@ -369,7 +369,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then recipe = "green-module-5-combine", }, }, - prerequisites = { "green-module-4", "effectivity-module-5", "pollution-clean-module-5" }, + prerequisites = { "green-module-4", "efficiency-module-5", "pollution-clean-module-5" }, unit = { count = 250, ingredients = { @@ -396,7 +396,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then recipe = "green-module-6-combine", }, }, - prerequisites = { "green-module-5", "effectivity-module-6", "pollution-clean-module-6" }, + prerequisites = { "green-module-5", "efficiency-module-6", "pollution-clean-module-6" }, unit = { count = 300, ingredients = { @@ -424,7 +424,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then recipe = "green-module-7-combine", }, }, - prerequisites = { "green-module-6", "effectivity-module-7", "pollution-clean-module-7" }, + prerequisites = { "green-module-6", "efficiency-module-7", "pollution-clean-module-7" }, unit = { count = 350, ingredients = { @@ -452,7 +452,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then recipe = "green-module-8-combine", }, }, - prerequisites = { "green-module-7", "effectivity-module-8", "pollution-clean-module-8" }, + prerequisites = { "green-module-7", "efficiency-module-8", "pollution-clean-module-8" }, unit = { count = 400, ingredients = { @@ -485,7 +485,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru recipe = "raw-productivity-module-1-combine", }, }, - prerequisites = { "module-merging", "productivity-module", "effectivity-module", "pollution-clean-module-1" }, + prerequisites = { "module-merging", "productivity-module", "efficiency-module", "pollution-clean-module-1" }, unit = { count = 50, ingredients = { @@ -514,7 +514,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru prerequisites = { "raw-productivity-module-1", "productivity-module-2", - "effectivity-module-2", + "efficiency-module-2", "pollution-clean-module-2", }, unit = { @@ -545,7 +545,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru prerequisites = { "raw-productivity-module-2", "productivity-module-3", - "effectivity-module-3", + "efficiency-module-3", "pollution-clean-module-3", }, unit = { @@ -577,7 +577,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru prerequisites = { "raw-productivity-module-3", "productivity-module-4", - "effectivity-module-4", + "efficiency-module-4", "pollution-clean-module-4", }, unit = { @@ -609,7 +609,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru prerequisites = { "raw-productivity-module-4", "productivity-module-5", - "effectivity-module-5", + "efficiency-module-5", "pollution-clean-module-5", }, unit = { @@ -641,7 +641,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru prerequisites = { "raw-productivity-module-5", "productivity-module-6", - "effectivity-module-6", + "efficiency-module-6", "pollution-clean-module-6", }, unit = { @@ -674,7 +674,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru prerequisites = { "raw-productivity-module-6", "productivity-module-7", - "effectivity-module-7", + "efficiency-module-7", "pollution-clean-module-7", }, unit = { @@ -707,7 +707,7 @@ if settings.startup["bobmods-modules-enablerawproductivitymodules"].value == tru prerequisites = { "raw-productivity-module-7", "productivity-module-8", - "effectivity-module-8", + "efficiency-module-8", "pollution-clean-module-8", }, unit = { @@ -753,7 +753,7 @@ if settings.startup["bobmods-modules-enablegodmodules"].value == true then "module-merging", "speed-module-2", "productivity-module-2", - "effectivity-module-2", + "efficiency-module-2", "pollution-clean-module-2", }, unit = { @@ -781,7 +781,7 @@ if settings.startup["bobmods-modules-enablegodmodules"].value == true then "god-module-1", "speed-module-4", "productivity-module-4", - "effectivity-module-4", + "efficiency-module-4", "pollution-clean-module-4", }, unit = { @@ -810,7 +810,7 @@ if settings.startup["bobmods-modules-enablegodmodules"].value == true then "god-module-2", "speed-module-6", "productivity-module-6", - "effectivity-module-6", + "efficiency-module-6", "pollution-clean-module-6", }, unit = { @@ -840,7 +840,7 @@ if settings.startup["bobmods-modules-enablegodmodules"].value == true then "god-module-3", "speed-module-8", "productivity-module-8", - "effectivity-module-8", + "efficiency-module-8", "pollution-clean-module-8", }, unit = { diff --git a/bobmodules/prototypes/technology/module-updates.lua b/bobmodules/prototypes/technology/module-updates.lua index 5f83c953..adf1437d 100644 --- a/bobmodules/prototypes/technology/module-updates.lua +++ b/bobmodules/prototypes/technology/module-updates.lua @@ -5,7 +5,7 @@ if mods["IndustrialRevolution"] then "module-contact", "module-processor-board", "speed-processor", - "effectivity-processor", + "efficiency-processor", "productivity-processor", "pollution-clean-processor", "pollution-create-processor", @@ -17,7 +17,7 @@ if mods["IndustrialRevolution"] then "module-processor-board-3", "speed-processor-2", "productivity-processor-2", - "effectivity-processor-2", + "efficiency-processor-2", }) do bobmods.lib.tech.add_recipe_unlock("ir2-modules-3", recipe_name) end diff --git a/bobmodules/prototypes/technology/module.lua b/bobmodules/prototypes/technology/module.lua index c0e0fa74..3d22dfca 100644 --- a/bobmodules/prototypes/technology/module.lua +++ b/bobmodules/prototypes/technology/module.lua @@ -135,36 +135,36 @@ data:extend({ }, }) -data.raw["technology"]["effectivity-module"].icon = "__bobmodules__/graphics/icons/yellow-module-1.png" -data.raw["technology"]["effectivity-module-2"].icon = "__bobmodules__/graphics/icons/yellow-module-2.png" -data.raw["technology"]["effectivity-module-3"].icon = "__bobmodules__/graphics/icons/yellow-module-3.png" +data.raw["technology"]["efficiency-module"].icon = "__bobmodules__/graphics/icons/yellow-module-1.png" +data.raw["technology"]["efficiency-module-2"].icon = "__bobmodules__/graphics/icons/yellow-module-2.png" +data.raw["technology"]["efficiency-module-3"].icon = "__bobmodules__/graphics/icons/yellow-module-3.png" -data.raw["technology"]["effectivity-module"].icon_size = 32 -data.raw["technology"]["effectivity-module-2"].icon_size = 32 -data.raw["technology"]["effectivity-module-3"].icon_size = 32 +data.raw["technology"]["efficiency-module"].icon_size = 32 +data.raw["technology"]["efficiency-module-2"].icon_size = 32 +data.raw["technology"]["efficiency-module-3"].icon_size = 32 -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) +bobmods.lib.tech.remove_science_pack("efficiency-module-2", "chemical-science-pack") +bobmods.lib.tech.remove_science_pack("efficiency-module-3", "production-science-pack") +bobmods.lib.tech.set_science_pack_count("efficiency-module-2", 100) +bobmods.lib.tech.set_science_pack_count("efficiency-module-3", 150) -data.raw["technology"]["effectivity-module"].upgrade = false -data.raw["technology"]["effectivity-module-2"].upgrade = false -data.raw["technology"]["effectivity-module-3"].upgrade = false +data.raw["technology"]["efficiency-module"].upgrade = false +data.raw["technology"]["efficiency-module-2"].upgrade = false +data.raw["technology"]["efficiency-module-3"].upgrade = false data:extend({ { type = "technology", - name = "effectivity-module-4", + name = "efficiency-module-4", icon = "__bobmodules__/graphics/icons/yellow-module-4.png", icon_size = 32, effects = { { type = "unlock-recipe", - recipe = "effectivity-module-4", + recipe = "efficiency-module-4", }, }, - prerequisites = { "effectivity-module-3" }, + prerequisites = { "efficiency-module-3" }, unit = { count = 200, ingredients = { @@ -178,16 +178,16 @@ data:extend({ }, { type = "technology", - name = "effectivity-module-5", + name = "efficiency-module-5", icon = "__bobmodules__/graphics/icons/yellow-module-5.png", icon_size = 32, effects = { { type = "unlock-recipe", - recipe = "effectivity-module-5", + recipe = "efficiency-module-5", }, }, - prerequisites = { "effectivity-module-4" }, + prerequisites = { "efficiency-module-4" }, unit = { count = 250, ingredients = { @@ -201,16 +201,16 @@ data:extend({ }, { type = "technology", - name = "effectivity-module-6", + name = "efficiency-module-6", icon = "__bobmodules__/graphics/icons/yellow-module-6.png", icon_size = 32, effects = { { type = "unlock-recipe", - recipe = "effectivity-module-6", + recipe = "efficiency-module-6", }, }, - prerequisites = { "effectivity-module-5" }, + prerequisites = { "efficiency-module-5" }, unit = { count = 300, ingredients = { @@ -225,16 +225,16 @@ data:extend({ }, { type = "technology", - name = "effectivity-module-7", + name = "efficiency-module-7", icon = "__bobmodules__/graphics/icons/yellow-module-7.png", icon_size = 32, effects = { { type = "unlock-recipe", - recipe = "effectivity-module-7", + recipe = "efficiency-module-7", }, }, - prerequisites = { "effectivity-module-6" }, + prerequisites = { "efficiency-module-6" }, unit = { count = 350, ingredients = { @@ -249,16 +249,16 @@ data:extend({ }, { type = "technology", - name = "effectivity-module-8", + name = "efficiency-module-8", icon = "__bobmodules__/graphics/icons/yellow-module-8.png", icon_size = 32, effects = { { type = "unlock-recipe", - recipe = "effectivity-module-8", + recipe = "efficiency-module-8", }, }, - prerequisites = { "effectivity-module-7" }, + prerequisites = { "efficiency-module-7" }, unit = { count = 400, ingredients = { @@ -789,8 +789,8 @@ data:extend({ table.insert(data.raw.technology["speed-module-3"].effects, { type = "unlock-recipe", recipe = "speed-processor-2" }) table.insert( - data.raw.technology["effectivity-module-3"].effects, - { type = "unlock-recipe", recipe = "effectivity-processor-2" } + data.raw.technology["efficiency-module-3"].effects, + { type = "unlock-recipe", recipe = "efficiency-processor-2" } ) table.insert( data.raw.technology["productivity-module-3"].effects, @@ -807,8 +807,8 @@ table.insert( table.insert(data.raw.technology["speed-module-6"].effects, { type = "unlock-recipe", recipe = "speed-processor-3" }) table.insert( - data.raw.technology["effectivity-module-6"].effects, - { type = "unlock-recipe", recipe = "effectivity-processor-3" } + data.raw.technology["efficiency-module-6"].effects, + { type = "unlock-recipe", recipe = "efficiency-processor-3" } ) table.insert( data.raw.technology["productivity-module-6"].effects, @@ -824,20 +824,20 @@ table.insert( ) table.insert(data.raw.technology["speed-module-3"].prerequisites, "advanced-electronics-2") -table.insert(data.raw.technology["effectivity-module-3"].prerequisites, "advanced-electronics-2") +table.insert(data.raw.technology["efficiency-module-3"].prerequisites, "advanced-electronics-2") table.insert(data.raw.technology["productivity-module-3"].prerequisites, "advanced-electronics-2") table.insert(data.raw.technology["pollution-clean-module-3"].prerequisites, "advanced-electronics-2") table.insert(data.raw.technology["pollution-create-module-3"].prerequisites, "advanced-electronics-2") if data.raw.technology["advanced-electronics-3"] then table.insert(data.raw.technology["speed-module-6"].prerequisites, "advanced-electronics-3") - table.insert(data.raw.technology["effectivity-module-6"].prerequisites, "advanced-electronics-3") + table.insert(data.raw.technology["efficiency-module-6"].prerequisites, "advanced-electronics-3") 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") 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("efficiency-module-6", "production-science-pack") bobmods.lib.tech.add_prerequisite("productivity-module-6", "production-science-pack") bobmods.lib.tech.add_prerequisite("pollution-clean-module-6", "production-science-pack") bobmods.lib.tech.add_prerequisite("pollution-create-module-6", "production-science-pack") diff --git a/bobvehicleequipment/prototypes/fusion-cell.lua b/bobvehicleequipment/prototypes/fusion-cell.lua index fde930b6..484d74a3 100644 --- a/bobvehicleequipment/prototypes/fusion-cell.lua +++ b/bobvehicleequipment/prototypes/fusion-cell.lua @@ -95,7 +95,7 @@ data:extend({ ingredients = { { type = "item", name = "vehicle-fusion-cell-1", amount = 1 }, { type = "item", name = "processing-unit", amount = 25 }, - { type = "item", name = "effectivity-module-2", amount = 1 }, + { type = "item", name = "efficiency-module-2", amount = 1 }, { type = "item", name = "speed-module-2", amount = 1 }, { type = "item", name = "productivity-module-2", amount = 1 }, }, @@ -176,7 +176,7 @@ data:extend({ ingredients = { { type = "item", name = "vehicle-fusion-cell-2", amount = 1 }, { type = "item", name = "processing-unit", amount = 25 }, - { type = "item", name = "effectivity-module-3", amount = 1 }, + { type = "item", name = "efficiency-module-3", amount = 1 }, { type = "item", name = "speed-module-3", amount = 1 }, { type = "item", name = "productivity-module-3", amount = 1 }, }, @@ -258,7 +258,7 @@ data:extend({ ingredients = { { type = "item", name = "vehicle-fusion-cell-3", amount = 1 }, { type = "item", name = "processing-unit", amount = 25 }, - { type = "item", name = "effectivity-module-3", amount = 1 }, + { type = "item", name = "efficiency-module-3", amount = 1 }, { type = "item", name = "speed-module-3", amount = 1 }, { type = "item", name = "productivity-module-3", amount = 1 }, }, @@ -339,7 +339,7 @@ data:extend({ ingredients = { { type = "item", name = "vehicle-fusion-cell-4", amount = 1 }, { type = "item", name = "processing-unit", amount = 25 }, - { type = "item", name = "effectivity-module-3", amount = 1 }, + { type = "item", name = "efficiency-module-3", amount = 1 }, { type = "item", name = "speed-module-3", amount = 1 }, { type = "item", name = "productivity-module-3", amount = 1 }, }, @@ -420,7 +420,7 @@ data:extend({ ingredients = { { type = "item", name = "vehicle-fusion-cell-5", amount = 1 }, { type = "item", name = "processing-unit", amount = 25 }, - { type = "item", name = "effectivity-module-3", amount = 1 }, + { type = "item", name = "efficiency-module-3", amount = 1 }, { type = "item", name = "speed-module-3", amount = 1 }, { type = "item", name = "productivity-module-3", amount = 1 }, }, diff --git a/bobvehicleequipment/prototypes/generator.lua b/bobvehicleequipment/prototypes/generator.lua index 74eee36b..4658bf75 100644 --- a/bobvehicleequipment/prototypes/generator.lua +++ b/bobvehicleequipment/prototypes/generator.lua @@ -95,7 +95,7 @@ data:extend({ ingredients = { { type = "item", name = "vehicle-fusion-reactor-1", amount = 1 }, { type = "item", name = "processing-unit", amount = 50 }, - { type = "item", name = "effectivity-module-2", amount = 2 }, + { type = "item", name = "efficiency-module-2", amount = 2 }, { type = "item", name = "speed-module-2", amount = 2 }, { type = "item", name = "productivity-module-2", amount = 2 }, }, @@ -176,7 +176,7 @@ data:extend({ ingredients = { { type = "item", name = "vehicle-fusion-reactor-2", amount = 1 }, { type = "item", name = "processing-unit", amount = 50 }, - { type = "item", name = "effectivity-module-3", amount = 2 }, + { type = "item", name = "efficiency-module-3", amount = 2 }, { type = "item", name = "speed-module-3", amount = 2 }, { type = "item", name = "productivity-module-3", amount = 2 }, }, @@ -258,7 +258,7 @@ data:extend({ ingredients = { { type = "item", name = "vehicle-fusion-reactor-3", amount = 1 }, { type = "item", name = "processing-unit", amount = 50 }, - { type = "item", name = "effectivity-module-3", amount = 2 }, + { type = "item", name = "efficiency-module-3", amount = 2 }, { type = "item", name = "speed-module-3", amount = 2 }, { type = "item", name = "productivity-module-3", amount = 2 }, }, @@ -339,7 +339,7 @@ data:extend({ ingredients = { { type = "item", name = "vehicle-fusion-reactor-4", amount = 1 }, { type = "item", name = "processing-unit", amount = 50 }, - { type = "item", name = "effectivity-module-3", amount = 2 }, + { type = "item", name = "efficiency-module-3", amount = 2 }, { type = "item", name = "speed-module-3", amount = 2 }, { type = "item", name = "productivity-module-3", amount = 2 }, }, @@ -420,7 +420,7 @@ data:extend({ ingredients = { { type = "item", name = "vehicle-fusion-reactor-5", amount = 1 }, { type = "item", name = "processing-unit", amount = 50 }, - { type = "item", name = "effectivity-module-3", amount = 2 }, + { type = "item", name = "efficiency-module-3", amount = 2 }, { type = "item", name = "speed-module-3", amount = 2 }, { type = "item", name = "productivity-module-3", amount = 2 }, }, diff --git a/bobvehicleequipment/prototypes/recipe-updates.lua b/bobvehicleequipment/prototypes/recipe-updates.lua index 1787fad8..9f725b8e 100644 --- a/bobvehicleequipment/prototypes/recipe-updates.lua +++ b/bobvehicleequipment/prototypes/recipe-updates.lua @@ -456,17 +456,17 @@ if data.raw.item["diamond-5"] then bobmods.lib.recipe.add_ingredient("vehicle-solar-panel-6", { type = "item", name = "diamond-5", amount = 1 }) end -if data.raw.module["effectivity-module-4"] then - bobmods.lib.recipe.replace_ingredient("vehicle-shield-4", "effectivity-module-3", "effectivity-module-4") +if data.raw.module["efficiency-module-4"] then + bobmods.lib.recipe.replace_ingredient("vehicle-shield-4", "efficiency-module-3", "efficiency-module-4") end if data.raw.module["productivity-module-4"] then bobmods.lib.recipe.replace_ingredient("vehicle-shield-4", "productivity-module-3", "productivity-module-4") end -if data.raw.module["effectivity-module-5"] then - bobmods.lib.recipe.replace_ingredient("vehicle-fusion-reactor-4", "effectivity-module-3", "effectivity-module-5") - bobmods.lib.recipe.replace_ingredient("vehicle-fusion-cell-4", "effectivity-module-3", "effectivity-module-5") +if data.raw.module["efficiency-module-5"] then + bobmods.lib.recipe.replace_ingredient("vehicle-fusion-reactor-4", "efficiency-module-3", "efficiency-module-5") + bobmods.lib.recipe.replace_ingredient("vehicle-fusion-cell-4", "efficiency-module-3", "efficiency-module-5") end if data.raw.module["speed-module-5"] then @@ -479,10 +479,10 @@ if data.raw.module["productivity-module-5"] then bobmods.lib.recipe.replace_ingredient("vehicle-fusion-cell-4", "productivity-module-3", "productivity-module-5") end -if data.raw.module["effectivity-module-6"] then - bobmods.lib.recipe.replace_ingredient("vehicle-shield-5", "effectivity-module-3", "effectivity-module-6") - bobmods.lib.recipe.replace_ingredient("vehicle-fusion-reactor-5", "effectivity-module-3", "effectivity-module-6") - bobmods.lib.recipe.replace_ingredient("vehicle-fusion-cell-5", "effectivity-module-3", "effectivity-module-6") +if data.raw.module["efficiency-module-6"] then + bobmods.lib.recipe.replace_ingredient("vehicle-shield-5", "efficiency-module-3", "efficiency-module-6") + bobmods.lib.recipe.replace_ingredient("vehicle-fusion-reactor-5", "efficiency-module-3", "efficiency-module-6") + bobmods.lib.recipe.replace_ingredient("vehicle-fusion-cell-5", "efficiency-module-3", "efficiency-module-6") end if data.raw.module["speed-module-6"] then @@ -496,10 +496,10 @@ if data.raw.module["productivity-module-6"] then bobmods.lib.recipe.replace_ingredient("vehicle-fusion-cell-5", "productivity-module-3", "productivity-module-6") end -if data.raw.module["effectivity-module-8"] then - bobmods.lib.recipe.replace_ingredient("vehicle-shield-6", "effectivity-module-3", "effectivity-module-8") - bobmods.lib.recipe.replace_ingredient("vehicle-fusion-reactor-6", "effectivity-module-3", "effectivity-module-8") - bobmods.lib.recipe.replace_ingredient("vehicle-fusion-cell-6", "effectivity-module-3", "effectivity-module-8") +if data.raw.module["efficiency-module-8"] then + bobmods.lib.recipe.replace_ingredient("vehicle-shield-6", "efficiency-module-3", "efficiency-module-8") + bobmods.lib.recipe.replace_ingredient("vehicle-fusion-reactor-6", "efficiency-module-3", "efficiency-module-8") + bobmods.lib.recipe.replace_ingredient("vehicle-fusion-cell-6", "efficiency-module-3", "efficiency-module-8") end if data.raw.module["speed-module-8"] then diff --git a/bobvehicleequipment/prototypes/shield.lua b/bobvehicleequipment/prototypes/shield.lua index ab5a42f3..6af7f1fc 100644 --- a/bobvehicleequipment/prototypes/shield.lua +++ b/bobvehicleequipment/prototypes/shield.lua @@ -266,7 +266,7 @@ data:extend({ ingredients = { { type = "item", name = "vehicle-shield-3", amount = 2 }, { type = "item", name = "processing-unit", amount = 5 }, - { type = "item", name = "effectivity-module-3", amount = 1 }, + { type = "item", name = "efficiency-module-3", amount = 1 }, { type = "item", name = "productivity-module-3", amount = 1 }, }, results = { { type = "item", name = "vehicle-shield-4", amount = 1 } }, @@ -349,7 +349,7 @@ data:extend({ ingredients = { { type = "item", name = "vehicle-shield-4", amount = 2 }, { type = "item", name = "processing-unit", amount = 5 }, - { type = "item", name = "effectivity-module-3", amount = 1 }, + { type = "item", name = "efficiency-module-3", amount = 1 }, { type = "item", name = "productivity-module-3", amount = 1 }, }, results = { { type = "item", name = "vehicle-shield-5", amount = 1 } }, @@ -434,7 +434,7 @@ data:extend({ ingredients = { { type = "item", name = "vehicle-shield-5", amount = 2 }, { type = "item", name = "processing-unit", amount = 5 }, - { type = "item", name = "effectivity-module-3", amount = 1 }, + { type = "item", name = "efficiency-module-3", amount = 1 }, { type = "item", name = "productivity-module-3", amount = 1 }, }, results = { { type = "item", name = "vehicle-shield-6", amount = 1 } }, diff --git a/bobvehicleequipment/prototypes/technology-updates.lua b/bobvehicleequipment/prototypes/technology-updates.lua index e222e7cc..49b0dc58 100644 --- a/bobvehicleequipment/prototypes/technology-updates.lua +++ b/bobvehicleequipment/prototypes/technology-updates.lua @@ -129,22 +129,22 @@ end bobmods.lib.tech.add_prerequisite("vehicle-fusion-reactor-equipment-2", "speed-module-2") bobmods.lib.tech.add_prerequisite("vehicle-fusion-cell-equipment-2", "speed-module-2") -bobmods.lib.tech.add_prerequisite("vehicle-fusion-reactor-equipment-2", "effectivity-module-2") -bobmods.lib.tech.add_prerequisite("vehicle-fusion-cell-equipment-2", "effectivity-module-2") +bobmods.lib.tech.add_prerequisite("vehicle-fusion-reactor-equipment-2", "efficiency-module-2") +bobmods.lib.tech.add_prerequisite("vehicle-fusion-cell-equipment-2", "efficiency-module-2") bobmods.lib.tech.add_prerequisite("vehicle-fusion-reactor-equipment-2", "productivity-module-2") bobmods.lib.tech.add_prerequisite("vehicle-fusion-cell-equipment-2", "productivity-module-2") bobmods.lib.tech.add_prerequisite("vehicle-fusion-reactor-equipment-3", "speed-module-3") bobmods.lib.tech.add_prerequisite("vehicle-fusion-cell-equipment-3", "speed-module-3") -bobmods.lib.tech.add_prerequisite("vehicle-fusion-reactor-equipment-3", "effectivity-module-3") -bobmods.lib.tech.add_prerequisite("vehicle-fusion-cell-equipment-3", "effectivity-module-3") +bobmods.lib.tech.add_prerequisite("vehicle-fusion-reactor-equipment-3", "efficiency-module-3") +bobmods.lib.tech.add_prerequisite("vehicle-fusion-cell-equipment-3", "efficiency-module-3") bobmods.lib.tech.add_prerequisite("vehicle-fusion-reactor-equipment-3", "productivity-module-3") bobmods.lib.tech.add_prerequisite("vehicle-fusion-cell-equipment-3", "productivity-module-3") -if data.raw.technology["effectivity-module-4"] then - bobmods.lib.tech.add_prerequisite("vehicle-energy-shield-equipment-4", "effectivity-module-4") +if data.raw.technology["efficiency-module-4"] then + bobmods.lib.tech.add_prerequisite("vehicle-energy-shield-equipment-4", "efficiency-module-4") else - bobmods.lib.tech.add_prerequisite("vehicle-energy-shield-equipment-4", "effectivity-module-3") + bobmods.lib.tech.add_prerequisite("vehicle-energy-shield-equipment-4", "efficiency-module-3") end if data.raw.technology["productivity-module-4"] then @@ -158,9 +158,9 @@ if data.raw.technology["speed-module-5"] then bobmods.lib.tech.add_prerequisite("vehicle-fusion-cell-equipment-4", "speed-module-5") end -if data.raw.technology["effectivity-module-5"] then - bobmods.lib.tech.add_prerequisite("vehicle-fusion-reactor-equipment-4", "effectivity-module-5") - bobmods.lib.tech.add_prerequisite("vehicle-fusion-cell-equipment-4", "effectivity-module-5") +if data.raw.technology["efficiency-module-5"] then + bobmods.lib.tech.add_prerequisite("vehicle-fusion-reactor-equipment-4", "efficiency-module-5") + bobmods.lib.tech.add_prerequisite("vehicle-fusion-cell-equipment-4", "efficiency-module-5") end if data.raw.technology["productivity-module-5"] then @@ -173,10 +173,10 @@ if data.raw.technology["speed-module-6"] then bobmods.lib.tech.add_prerequisite("vehicle-fusion-cell-equipment-5", "speed-module-6") end -if data.raw.technology["effectivity-module-6"] then - bobmods.lib.tech.add_prerequisite("vehicle-energy-shield-equipment-5", "effectivity-module-6") - bobmods.lib.tech.add_prerequisite("vehicle-fusion-reactor-equipment-5", "effectivity-module-6") - bobmods.lib.tech.add_prerequisite("vehicle-fusion-cell-equipment-5", "effectivity-module-6") +if data.raw.technology["efficiency-module-6"] then + bobmods.lib.tech.add_prerequisite("vehicle-energy-shield-equipment-5", "efficiency-module-6") + bobmods.lib.tech.add_prerequisite("vehicle-fusion-reactor-equipment-5", "efficiency-module-6") + bobmods.lib.tech.add_prerequisite("vehicle-fusion-cell-equipment-5", "efficiency-module-6") end if data.raw.technology["productivity-module-6"] then @@ -190,10 +190,10 @@ if data.raw.technology["speed-module-8"] then bobmods.lib.tech.add_prerequisite("vehicle-fusion-cell-equipment-6", "speed-module-8") end -if data.raw.technology["effectivity-module-8"] then - bobmods.lib.tech.add_prerequisite("vehicle-energy-shield-equipment-6", "effectivity-module-8") - bobmods.lib.tech.add_prerequisite("vehicle-fusion-reactor-equipment-6", "effectivity-module-8") - bobmods.lib.tech.add_prerequisite("vehicle-fusion-cell-equipment-6", "effectivity-module-8") +if data.raw.technology["efficiency-module-8"] then + bobmods.lib.tech.add_prerequisite("vehicle-energy-shield-equipment-6", "efficiency-module-8") + bobmods.lib.tech.add_prerequisite("vehicle-fusion-reactor-equipment-6", "efficiency-module-8") + bobmods.lib.tech.add_prerequisite("vehicle-fusion-cell-equipment-6", "efficiency-module-8") end if data.raw.technology["productivity-module-8"] then diff --git a/bobwarfare/prototypes/recipe/armor-recipe.lua b/bobwarfare/prototypes/recipe/armor-recipe.lua index bdba74c9..a4285a88 100644 --- a/bobwarfare/prototypes/recipe/armor-recipe.lua +++ b/bobwarfare/prototypes/recipe/armor-recipe.lua @@ -33,7 +33,7 @@ data:extend({ { type = "item", name = "processing-unit", amount = 50 }, { type = "item", name = "steel-plate", amount = 25 }, { type = "item", name = "iron-plate", amount = 25 }, - { type = "item", name = "effectivity-module-2", amount = 5 }, + { type = "item", name = "efficiency-module-2", amount = 5 }, { type = "item", name = "speed-module-2", amount = 5 }, }, results = { { type = "item", name = "bob-power-armor-mk3", amount = 1 } }, @@ -49,7 +49,7 @@ data:extend({ { type = "item", name = "advanced-circuit", amount = 20 }, { type = "item", name = "steel-plate", amount = 25 }, { type = "item", name = "plastic-bar", amount = 25 }, - { type = "item", name = "effectivity-module-3", amount = 5 }, + { type = "item", name = "efficiency-module-3", amount = 5 }, { type = "item", name = "speed-module-3", amount = 5 }, }, results = { { type = "item", name = "bob-power-armor-mk4", amount = 1 } }, @@ -65,7 +65,7 @@ data:extend({ { type = "item", name = "advanced-circuit", amount = 50 }, { type = "item", name = "steel-plate", amount = 25 }, { type = "item", name = "plastic-bar", amount = 25 }, - { type = "item", name = "effectivity-module-3", amount = 5 }, + { type = "item", name = "efficiency-module-3", amount = 5 }, { type = "item", name = "speed-module-3", amount = 5 }, }, results = { { type = "item", name = "bob-power-armor-mk5", amount = 1 } }, diff --git a/bobwarfare/prototypes/recipe/recipe-updates.lua b/bobwarfare/prototypes/recipe/recipe-updates.lua index 847b1bef..6a2d2fb8 100644 --- a/bobwarfare/prototypes/recipe/recipe-updates.lua +++ b/bobwarfare/prototypes/recipe/recipe-updates.lua @@ -304,24 +304,24 @@ if data.raw.item["diamond-5"] then end if mods["bobmodules"] then - if data.raw.module["effectivity-module-4"] then - bobmods.lib.recipe.replace_ingredient("bob-power-armor-mk3", "effectivity-module-2", "effectivity-module-4") + if data.raw.module["efficiency-module-4"] then + bobmods.lib.recipe.replace_ingredient("bob-power-armor-mk3", "efficiency-module-2", "efficiency-module-4") end if data.raw.module["speed-module-4"] then bobmods.lib.recipe.replace_ingredient("bob-power-armor-mk3", "speed-module-2", "speed-module-4") end - if data.raw.module["effectivity-module-6"] then - bobmods.lib.recipe.replace_ingredient("bob-power-armor-mk4", "effectivity-module-3", "effectivity-module-6") + if data.raw.module["efficiency-module-6"] then + bobmods.lib.recipe.replace_ingredient("bob-power-armor-mk4", "efficiency-module-3", "efficiency-module-6") end if data.raw.module["speed-module-6"] then bobmods.lib.recipe.replace_ingredient("bob-power-armor-mk4", "speed-module-3", "speed-module-6") end - if data.raw.module["effectivity-module-8"] then - bobmods.lib.recipe.replace_ingredient("bob-power-armor-mk5", "effectivity-module-3", "effectivity-module-8") + if data.raw.module["efficiency-module-8"] then + bobmods.lib.recipe.replace_ingredient("bob-power-armor-mk5", "efficiency-module-3", "efficiency-module-8") end if data.raw.module["speed-module-8"] then @@ -329,7 +329,7 @@ if mods["bobmodules"] then end else bobmods.lib.recipe.replace_ingredient("power-armor-mk2", "speed-module-2", "speed-module") - bobmods.lib.recipe.replace_ingredient("power-armor-mk2", "effectivity-module-2", "effectivity-module") + bobmods.lib.recipe.replace_ingredient("power-armor-mk2", "efficiency-module-2", "efficiency-module") end if data.raw.item["alien-artifact"] then diff --git a/bobwarfare/prototypes/spidertron-updates.lua b/bobwarfare/prototypes/spidertron-updates.lua index 53bc740a..42ec92b7 100644 --- a/bobwarfare/prototypes/spidertron-updates.lua +++ b/bobwarfare/prototypes/spidertron-updates.lua @@ -4,7 +4,7 @@ table.insert(data.raw["spider-vehicle"]["spidertron"].resistances, { type = "bob bobmods.lib.recipe.remove_ingredient("spidertron", "raw-fish") bobmods.lib.recipe.remove_ingredient("spidertron", "radar") -bobmods.lib.tech.remove_prerequisite("spidertron", "effectivity-module-3") +bobmods.lib.tech.remove_prerequisite("spidertron", "efficiency-module-3") bobmods.lib.tech.remove_prerequisite("spidertron", "exoskeleton-equipment") bobmods.lib.tech.add_prerequisite("spidertron", "walking-vehicle") @@ -171,7 +171,7 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then bobmods.lib.recipe.add_ingredient("spidertron", { type = "item", name = "mech-leg", amount = 8 }) bobmods.lib.recipe.remove_ingredient("spidertron", "low-density-structure") bobmods.lib.recipe.remove_ingredient("spidertron", "rocket-control-unit") - bobmods.lib.recipe.remove_ingredient("spidertron", "effectivity-module-3") + bobmods.lib.recipe.remove_ingredient("spidertron", "efficiency-module-3") bobmods.lib.recipe.add_ingredient("spidertron", { type = "item", name = "mech-frame", amount = 1 }) bobmods.lib.recipe.add_ingredient("spidertron", { type = "item", name = "mech-armor-plate", amount = 10 }) bobmods.lib.recipe.set_energy_required("spidertron", 5) @@ -229,8 +229,8 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then bobmods.lib.recipe.add_ingredient("mech-brain", { type = "item", name = "advanced-processing-unit", amount = 20 }) bobmods.lib.tech.add_prerequisite("walking-vehicle", "advanced-electronics-3") else - bobmods.lib.recipe.add_ingredient("mech-brain", { type = "item", name = "effectivity-module-3", amount = 6 }) - bobmods.lib.tech.add_prerequisite("walking-vehicle", "effectivity-module-3") + bobmods.lib.recipe.add_ingredient("mech-brain", { type = "item", name = "efficiency-module-3", amount = 6 }) + bobmods.lib.tech.add_prerequisite("walking-vehicle", "efficiency-module-3") end if data.raw.tool["module-case"] or data.raw.item["module-case"] then @@ -244,8 +244,8 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then end else if data.raw.item["advanced-processing-unit"] then - bobmods.lib.recipe.remove_ingredient("spidertron", "effectivity-module-3") - bobmods.lib.tech.remove_prerequisite("spidertron", "effectivity-module-3") + bobmods.lib.recipe.remove_ingredient("spidertron", "efficiency-module-3") + bobmods.lib.tech.remove_prerequisite("spidertron", "efficiency-module-3") bobmods.lib.recipe.add_ingredient("spidertron", { type = "item", name = "advanced-processing-unit", amount = 10 }) bobmods.lib.recipe.add_ingredient("antron", { type = "item", name = "advanced-processing-unit", amount = 8 }) @@ -260,14 +260,14 @@ else { type = "item", name = "advanced-processing-unit", amount = 16 } ) else - bobmods.lib.recipe.add_ingredient("antron", { type = "item", name = "effectivity-module-3", amount = 2 }) - bobmods.lib.tech.add_prerequisite("walking-vehicle", "effectivity-module-3") - bobmods.lib.recipe.add_ingredient("tankotron", { type = "item", name = "effectivity-module-3", amount = 2 }) + bobmods.lib.recipe.add_ingredient("antron", { type = "item", name = "efficiency-module-3", amount = 2 }) + bobmods.lib.tech.add_prerequisite("walking-vehicle", "efficiency-module-3") + bobmods.lib.recipe.add_ingredient("tankotron", { type = "item", name = "efficiency-module-3", amount = 2 }) bobmods.lib.recipe.add_ingredient( "logistic-spidertron", - { type = "item", name = "effectivity-module-3", amount = 3 } + { type = "item", name = "efficiency-module-3", amount = 3 } ) - bobmods.lib.recipe.add_ingredient("heavy-spidertron", { type = "item", name = "effectivity-module-3", amount = 4 }) + bobmods.lib.recipe.add_ingredient("heavy-spidertron", { type = "item", name = "efficiency-module-3", amount = 4 }) end bobmods.lib.recipe.add_ingredient("antron", { type = "item", name = "exoskeleton-equipment", amount = 3 }) diff --git a/bobwarfare/prototypes/spidertron.lua b/bobwarfare/prototypes/spidertron.lua index 6844ca91..626f25c8 100644 --- a/bobwarfare/prototypes/spidertron.lua +++ b/bobwarfare/prototypes/spidertron.lua @@ -822,7 +822,7 @@ data:extend({ "fusion-reactor-equipment", "rocketry", "rocket-control-unit", - "effectivity-module-3" + "efficiency-module-3" }, unit = { diff --git a/bobwarfare/prototypes/technology/armor.lua b/bobwarfare/prototypes/technology/armor.lua index b4469556..efc5eeb5 100644 --- a/bobwarfare/prototypes/technology/armor.lua +++ b/bobwarfare/prototypes/technology/armor.lua @@ -59,7 +59,7 @@ data:extend({ icon = "__bobwarfare__/graphics/icons/technology/power-armor-mk3.png", icon_size = 64, prerequisites = { - "effectivity-module-2", + "efficiency-module-2", "power-armor-mk2", "speed-module-2", "production-science-pack", @@ -91,7 +91,7 @@ data:extend({ icon_size = 64, prerequisites = { "bob-power-armor-3", - "effectivity-module-3", + "efficiency-module-3", "speed-module-3", "utility-science-pack", }, diff --git a/bobwarfare/prototypes/technology/technology-updates.lua b/bobwarfare/prototypes/technology/technology-updates.lua index c35fb324..c619e625 100644 --- a/bobwarfare/prototypes/technology/technology-updates.lua +++ b/bobwarfare/prototypes/technology/technology-updates.lua @@ -532,29 +532,29 @@ if mods["bobmodules"] then bobmods.lib.tech.add_prerequisite("bob-power-armor-3", "speed-module-4") end - if data.raw.technology["effectivity-module-4"] then - bobmods.lib.tech.remove_prerequisite("bob-power-armor-3", "effectivity-module-2") - bobmods.lib.tech.add_prerequisite("bob-power-armor-3", "effectivity-module-4") + if data.raw.technology["efficiency-module-4"] then + bobmods.lib.tech.remove_prerequisite("bob-power-armor-3", "efficiency-module-2") + bobmods.lib.tech.add_prerequisite("bob-power-armor-3", "efficiency-module-4") end if data.raw.technology["speed-module-6"] then bobmods.lib.tech.add_prerequisite("bob-power-armor-4", "speed-module-6") end - if data.raw.technology["effectivity-module-6"] then - bobmods.lib.tech.add_prerequisite("bob-power-armor-4", "effectivity-module-6") + if data.raw.technology["efficiency-module-6"] then + bobmods.lib.tech.add_prerequisite("bob-power-armor-4", "efficiency-module-6") end if data.raw.technology["speed-module-8"] then bobmods.lib.tech.add_prerequisite("bob-power-armor-5", "speed-module-8") end - if data.raw.technology["effectivity-module-8"] then - bobmods.lib.tech.add_prerequisite("bob-power-armor-5", "effectivity-module-8") + if data.raw.technology["efficiency-module-8"] then + bobmods.lib.tech.add_prerequisite("bob-power-armor-5", "efficiency-module-8") end else bobmods.lib.tech.replace_prerequisite("power-armor-mk2", "speed-module-2", "speed-module") - bobmods.lib.tech.replace_prerequisite("power-armor-mk2", "effectivity-module-2", "effectivity-module") + bobmods.lib.tech.replace_prerequisite("power-armor-mk2", "efficiency-module-2", "efficiency-module") end if mods["boblogistics"] then