Merge branch 'dev' into 2.0-prep

modded-factorio · Sep 18, 2024 · 81aa9ba · 81aa9ba
2 parents 49ec052 + 0b350c5
commit 81aa9ba
Show file tree

Hide file tree

Showing 21 changed files with 166 additions and 977 deletions.
diff --git a/bobassembly/prototypes/assembly-electronics.lua b/bobassembly/prototypes/assembly-electronics.lua
@@ -296,6 +296,7 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
       energy_usage = "213.75kW",
       module_specification = {
         module_slots = 4,
+        module_info_max_icons_per_row = 3,
       },
       allowed_effects = { "consumption", "speed", "productivity", "pollution" },
     },
@@ -467,6 +468,7 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
       energy_usage = "360kW",
       module_specification = {
         module_slots = 6,
+        module_info_max_icons_per_row = 3,
       },
       allowed_effects = { "consumption", "speed", "productivity", "pollution" },
     },

diff --git a/bobenemies/changelog.txt b/bobenemies/changelog.txt
@@ -3,6 +3,8 @@ Version: 1.3.0
 Date: ???
   Changes:
     - Update for Factorio 2.0 #189
+  Bugfixes:
+    - Fixed missing poison cloud localisation #195
 ---------------------------------------------------------------------------------------------------
 Version: 1.2.0
 Date: 22. 12. 2023

diff --git a/bobenemies/prototypes/entities.lua b/bobenemies/prototypes/entities.lua
@@ -2,6 +2,7 @@ data:extend({
   {
     type = "smoke-with-trigger",
     name = "small-poison-cloud",
+    localised_name = { "entity-name.poison-cloud" },
     flags = { "not-on-map" },
     show_when_smoke_off = true,
     animation = {

diff --git a/boblogistics/prototypes/recipe/roboport-parts-recipe.lua b/boblogistics/prototypes/recipe/roboport-parts-recipe.lua
@@ -9,7 +9,7 @@ data:extend({
       { type = "item", name = "electronic-circuit", amount = 5 },
     },
     results = { { type = "item", name = "roboport-antenna-1", amount = 1 } },
-    energy_required = 0.2,
+    energy_required = 2,
   },
   {
     type = "recipe",
@@ -21,7 +21,7 @@ data:extend({
       { type = "item", name = "advanced-circuit", amount = 5 },
     },
     results = { { type = "item", name = "roboport-antenna-2", amount = 1 } },
-    energy_required = 0.2,
+    energy_required = 2,
   },
   {
     type = "recipe",
@@ -33,7 +33,7 @@ data:extend({
       { type = "item", name = "processing-unit", amount = 5 },
     },
     results = { { type = "item", name = "roboport-antenna-3", amount = 1 } },
-    energy_required = 0.2,
+    energy_required = 2,
   },
   {
     type = "recipe",
@@ -46,7 +46,7 @@ data:extend({
       { type = "item", name = "processing-unit", amount = 5 },
     },
     results = { { type = "item", name = "roboport-antenna-4", amount = 1 } },
-    energy_required = 0.2,
+    energy_required = 2,
   },
 })
 

diff --git a/bobmodules/changelog.txt b/bobmodules/changelog.txt
@@ -3,6 +3,7 @@ Version: 1.3.0
 Date: ???
   Changes:
     - Update for Factorio 2.0 #189
+    - Removed Modules Lab #196
 ---------------------------------------------------------------------------------------------------
 Version: 1.2.0
 Date: 22. 12. 2023

diff --git a/bobmodules/data.lua b/bobmodules/data.lua
@@ -5,11 +5,6 @@ if not bobmods.modules then
   bobmods.modules = {}
 end
 
-bobmods.modules.ModulesLab = settings.startup["bobmods-modules-enable-modules-lab"].value
-if mods["IndustrialRevolution"] then
-  bobmods.modules.ModulesLab = false
-end
-
 bobmods.modules.SpeedPerLevel = settings.startup["bobmods-modules-perlevel-bonus-speed"].value
 bobmods.modules.PollutionPerLevel = settings.startup["bobmods-modules-perlevel-bonus-pollution"].value
 bobmods.modules.ConsumptionPerLevel = settings.startup["bobmods-modules-perlevel-bonus-consumption"].value
@@ -29,7 +24,6 @@ bobmods.modules.PollutionPenalty = settings.startup["bobmods-modules-start-penal
 bobmods.modules.ConsumptionPenalty = settings.startup["bobmods-modules-start-penalty-consumption"].value
 
 require("prototypes.category")
-require("prototypes.lab")
 require("prototypes.beacon")
 
 require("prototypes.item.module")

diff --git a/bobmodules/locale/en/bobmodules.cfg b/bobmodules/locale/en/bobmodules.cfg
@@ -80,8 +80,6 @@ god-module-5=God module 5
 beacon-2=Beacon 2
 beacon-3=Beacon 3
 
-lab-module=Modules lab
-
 module-case=Module case
 module-contact=Module contact
 module-circuit-board=Module main board
@@ -123,7 +121,6 @@ module-merging=Module effect combining
 beacon-2=Beacon 2
 beacon-3=Beacon 3
 
-lab-module=Modules lab
 
 
 [item-group-name]
@@ -138,7 +135,6 @@ bobmods-modules-enablegodmodules=God modules
 bobmods-modules-enableproductivitylimitation=Productivity limitations
 bobmods-modules-productivityhasspeed=Speed on Productivity modules
 bobmods-modules-transmitproductivity=Transmit productivity
-bobmods-modules-enable-modules-lab=Modules lab
 
 bobmods-modules-perlevel-bonus-speed=Module speed bonus per tier
 bobmods-modules-perlevel-bonus-pollution=Module pollution bonus per tier
@@ -167,4 +163,3 @@ bobmods-modules-enablegodmodules=If enabled, then God modules and research will
 bobmods-modules-enableproductivitylimitation=If enabled, modules that effect productivity can only be used on Registered intermediates. Warning: The game will delete any modules that do not match the limits
 bobmods-modules-productivityhasspeed=If enabled, Productivity modules suffer speed penalty. Raw productivity modules also cost Speed circuits.
 bobmods-modules-transmitproductivity=If enabled, the Beacons can transmit the productivity effect.
-bobmods-modules-enable-modules-lab=If enabled, module techs will be researched in a dedicated lab and require module components instead of science packs.
diff --git a/bobmodules/prototypes/item/electronics.lua b/bobmodules/prototypes/item/electronics.lua
@@ -1,143 +1,68 @@
-if bobmods.modules.ModulesLab then
-  data:extend({
-    {
-      type = "tool",
-      name = "module-case",
-      icon = "__bobmodules__/graphics/icons/module-case.png",
-      icon_size = 32,
-      subgroup = "module-intermediates",
-      order = "c-0[module-case]",
-      stack_size = 100,
-      durability = 1,
-    },
-    {
-      type = "tool",
-      name = "module-circuit-board",
-      icon = "__bobmodules__/graphics/icons/module-circuit-board.png",
-      icon_size = 32,
-      subgroup = "module-intermediates",
-      order = "c-b4[module-circuit-board]",
-      stack_size = 200,
-      durability = 1,
-    },
-    {
-      type = "tool",
-      name = "speed-processor",
-      icon = "__bobmodules__/graphics/icons/speed-processor.png",
-      icon_size = 32,
-      subgroup = "module-intermediates",
-      order = "c-c4[speed-processor-1]",
-      stack_size = 100,
-      durability = 1,
-    },
-    {
-      type = "tool",
-      name = "effectivity-processor",
-      icon = "__bobmodules__/graphics/icons/effectivity-processor.png",
-      icon_size = 32,
-      subgroup = "module-intermediates",
-      order = "c-c5[effectivity-processor-1]",
-      stack_size = 100,
-      durability = 1,
-    },
-    {
-      type = "tool",
-      name = "productivity-processor",
-      icon = "__bobmodules__/graphics/icons/productivity-processor.png",
-      icon_size = 32,
-      subgroup = "module-intermediates",
-      order = "c-c6[productivity-processor-1]",
-      stack_size = 100,
-      durability = 1,
-    },
-    {
-      type = "tool",
-      name = "pollution-clean-processor",
-      icon = "__bobmodules__/graphics/icons/pollution-clean-processor.png",
-      icon_size = 32,
-      subgroup = "module-intermediates",
-      order = "c-c7[pollution-clean-processor-1]",
-      stack_size = 100,
-      durability = 1,
-    },
-    {
-      type = "tool",
-      name = "pollution-create-processor",
-      icon = "__bobmodules__/graphics/icons/pollution-create-processor.png",
-      icon_size = 32,
-      subgroup = "module-intermediates",
-      order = "c-c8[pollution-create-processor-1]",
-      stack_size = 100,
-      durability = 1,
-    },
-  })
-else
-  data:extend({
-    {
-      type = "item",
-      name = "module-case",
-      icon = "__bobmodules__/graphics/icons/module-case.png",
-      icon_size = 32,
-      subgroup = "module-intermediates",
-      order = "c-0[module-case]",
-      stack_size = 100,
-    },
-    {
-      type = "item",
-      name = "module-circuit-board",
-      icon = "__bobmodules__/graphics/icons/module-circuit-board.png",
-      icon_size = 32,
-      subgroup = "module-intermediates",
-      order = "c-b4[module-circuit-board]",
-      stack_size = 200,
-    },
-    {
-      type = "item",
-      name = "speed-processor",
-      icon = "__bobmodules__/graphics/icons/speed-processor.png",
-      icon_size = 32,
-      subgroup = "module-intermediates",
-      order = "c-c4[speed-processor-1]",
-      stack_size = 100,
-    },
-    {
-      type = "item",
-      name = "effectivity-processor",
-      icon = "__bobmodules__/graphics/icons/effectivity-processor.png",
-      icon_size = 32,
-      subgroup = "module-intermediates",
-      order = "c-c5[effectivity-processor-1]",
-      stack_size = 100,
-    },
-    {
-      type = "item",
-      name = "productivity-processor",
-      icon = "__bobmodules__/graphics/icons/productivity-processor.png",
-      icon_size = 32,
-      subgroup = "module-intermediates",
-      order = "c-c6[productivity-processor-1]",
-      stack_size = 100,
-    },
-    {
-      type = "item",
-      name = "pollution-clean-processor",
-      icon = "__bobmodules__/graphics/icons/pollution-clean-processor.png",
-      icon_size = 32,
-      subgroup = "module-intermediates",
-      order = "c-c7[pollution-clean-processor-1]",
-      stack_size = 100,
-    },
-    {
-      type = "item",
-      name = "pollution-create-processor",
-      icon = "__bobmodules__/graphics/icons/pollution-create-processor.png",
-      icon_size = 32,
-      subgroup = "module-intermediates",
-      order = "c-c8[pollution-create-processor-1]",
-      stack_size = 100,
-    },
-  })
-end
+data:extend({
+  {
+    type = "item",
+    name = "module-case",
+    icon = "__bobmodules__/graphics/icons/module-case.png",
+    icon_size = 32,
+    subgroup = "module-intermediates",
+    order = "c-0[module-case]",
+    stack_size = 100,
+  },
+  {
+    type = "item",
+    name = "module-circuit-board",
+    icon = "__bobmodules__/graphics/icons/module-circuit-board.png",
+    icon_size = 32,
+    subgroup = "module-intermediates",
+    order = "c-b4[module-circuit-board]",
+    stack_size = 200,
+  },
+  {
+    type = "item",
+    name = "speed-processor",
+    icon = "__bobmodules__/graphics/icons/speed-processor.png",
+    icon_size = 32,
+    subgroup = "module-intermediates",
+    order = "c-c4[speed-processor-1]",
+    stack_size = 100,
+  },
+  {
+    type = "item",
+    name = "effectivity-processor",
+    icon = "__bobmodules__/graphics/icons/effectivity-processor.png",
+    icon_size = 32,
+    subgroup = "module-intermediates",
+    order = "c-c5[effectivity-processor-1]",
+    stack_size = 100,
+  },
+  {
+    type = "item",
+    name = "productivity-processor",
+    icon = "__bobmodules__/graphics/icons/productivity-processor.png",
+    icon_size = 32,
+    subgroup = "module-intermediates",
+    order = "c-c6[productivity-processor-1]",
+    stack_size = 100,
+  },
+  {
+    type = "item",
+    name = "pollution-clean-processor",
+    icon = "__bobmodules__/graphics/icons/pollution-clean-processor.png",
+    icon_size = 32,
+    subgroup = "module-intermediates",
+    order = "c-c7[pollution-clean-processor-1]",
+    stack_size = 100,
+  },
+  {
+    type = "item",
+    name = "pollution-create-processor",
+    icon = "__bobmodules__/graphics/icons/pollution-create-processor.png",
+    icon_size = 32,
+    subgroup = "module-intermediates",
+    order = "c-c8[pollution-create-processor-1]",
+    stack_size = 100,
+  },
+})
 
 data:extend({
   {