Renaming effectivity to efficiency

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 },
     },

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

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

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)

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,20 +33,20 @@ 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"
 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")

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

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=Схема супермодуля увеличения загрязнения

bobmodules/prototypes/category.lua

@@ -48,7 +48,7 @@ data:extend({
   },
   {
     type = "item-subgroup",
-    name = "effectivity-module",
+    name = "efficiency-module",
     group = "bobmodules",
     order = "f-2",
   },

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,
   },
   {