Bob's Modules Icons #270

modded-factorio · Jan 12, 2025 · 49b51ac · 49b51ac
1 parent e2ec5c4
commit 49b51ac
Show file tree

Hide file tree

Showing 74 changed files with 145 additions and 248 deletions.
diff --git a/bobmodules/graphics/icons/blue/blue_01.png b/bobmodules/graphics/icons/blue/blue_01.png
diff --git a/bobmodules/graphics/icons/blue/blue_02.png b/bobmodules/graphics/icons/blue/blue_02.png
diff --git a/bobmodules/graphics/icons/blue/blue_03.png b/bobmodules/graphics/icons/blue/blue_03.png
diff --git a/bobmodules/graphics/icons/blue/blue_04.png b/bobmodules/graphics/icons/blue/blue_04.png
diff --git a/bobmodules/graphics/icons/blue/blue_05.png b/bobmodules/graphics/icons/blue/blue_05.png
diff --git a/bobmodules/graphics/icons/brown/brown_01.png b/bobmodules/graphics/icons/brown/brown_01.png
diff --git a/bobmodules/graphics/icons/brown/brown_02.png b/bobmodules/graphics/icons/brown/brown_02.png
diff --git a/bobmodules/graphics/icons/brown/brown_03.png b/bobmodules/graphics/icons/brown/brown_03.png
diff --git a/bobmodules/graphics/icons/brown/brown_04.png b/bobmodules/graphics/icons/brown/brown_04.png
diff --git a/bobmodules/graphics/icons/brown/brown_05.png b/bobmodules/graphics/icons/brown/brown_05.png
diff --git a/bobmodules/graphics/icons/gray-red/gray-red_01.png b/bobmodules/graphics/icons/gray-red/gray-red_01.png
diff --git a/bobmodules/graphics/icons/gray-red/gray-red_02.png b/bobmodules/graphics/icons/gray-red/gray-red_02.png
diff --git a/bobmodules/graphics/icons/gray-red/gray-red_03.png b/bobmodules/graphics/icons/gray-red/gray-red_03.png
diff --git a/bobmodules/graphics/icons/gray-red/gray-red_04.png b/bobmodules/graphics/icons/gray-red/gray-red_04.png
diff --git a/bobmodules/graphics/icons/gray-red/gray-red_05.png b/bobmodules/graphics/icons/gray-red/gray-red_05.png
diff --git a/bobmodules/graphics/icons/green-module-1.png b/bobmodules/graphics/icons/green-module-1.png
diff --git a/bobmodules/graphics/icons/green-module-2.png b/bobmodules/graphics/icons/green-module-2.png
diff --git a/bobmodules/graphics/icons/green-module-3.png b/bobmodules/graphics/icons/green-module-3.png
diff --git a/bobmodules/graphics/icons/green-module-4.png b/bobmodules/graphics/icons/green-module-4.png
diff --git a/bobmodules/graphics/icons/green-module-5.png b/bobmodules/graphics/icons/green-module-5.png
diff --git a/bobmodules/graphics/icons/green/green_01.png b/bobmodules/graphics/icons/green/green_01.png
diff --git a/bobmodules/graphics/icons/green/green_02.png b/bobmodules/graphics/icons/green/green_02.png
diff --git a/bobmodules/graphics/icons/green/green_03.png b/bobmodules/graphics/icons/green/green_03.png
diff --git a/bobmodules/graphics/icons/green/green_04.png b/bobmodules/graphics/icons/green/green_04.png
diff --git a/bobmodules/graphics/icons/green/green_05.png b/bobmodules/graphics/icons/green/green_05.png
diff --git a/bobmodules/graphics/icons/pine/pine_01.png b/bobmodules/graphics/icons/pine/pine_01.png
diff --git a/bobmodules/graphics/icons/pine/pine_02.png b/bobmodules/graphics/icons/pine/pine_02.png
diff --git a/bobmodules/graphics/icons/pine/pine_03.png b/bobmodules/graphics/icons/pine/pine_03.png
diff --git a/bobmodules/graphics/icons/pine/pine_04.png b/bobmodules/graphics/icons/pine/pine_04.png
diff --git a/bobmodules/graphics/icons/pine/pine_05.png b/bobmodules/graphics/icons/pine/pine_05.png
diff --git a/bobmodules/graphics/icons/pollution-clean-module-1.png b/bobmodules/graphics/icons/pollution-clean-module-1.png
diff --git a/bobmodules/graphics/icons/pollution-clean-module-2.png b/bobmodules/graphics/icons/pollution-clean-module-2.png
diff --git a/bobmodules/graphics/icons/pollution-clean-module-3.png b/bobmodules/graphics/icons/pollution-clean-module-3.png
diff --git a/bobmodules/graphics/icons/pollution-clean-module-4.png b/bobmodules/graphics/icons/pollution-clean-module-4.png
diff --git a/bobmodules/graphics/icons/pollution-clean-module-5.png b/bobmodules/graphics/icons/pollution-clean-module-5.png
diff --git a/bobmodules/graphics/icons/pollution-create-module-1.png b/bobmodules/graphics/icons/pollution-create-module-1.png
diff --git a/bobmodules/graphics/icons/pollution-create-module-2.png b/bobmodules/graphics/icons/pollution-create-module-2.png
diff --git a/bobmodules/graphics/icons/pollution-create-module-3.png b/bobmodules/graphics/icons/pollution-create-module-3.png
diff --git a/bobmodules/graphics/icons/pollution-create-module-4.png b/bobmodules/graphics/icons/pollution-create-module-4.png
diff --git a/bobmodules/graphics/icons/pollution-create-module-5.png b/bobmodules/graphics/icons/pollution-create-module-5.png
diff --git a/bobmodules/graphics/icons/quality-module-1.png b/bobmodules/graphics/icons/quality-module-1.png
diff --git a/bobmodules/graphics/icons/quality-module-2.png b/bobmodules/graphics/icons/quality-module-2.png
diff --git a/bobmodules/graphics/icons/quality-module-3.png b/bobmodules/graphics/icons/quality-module-3.png
diff --git a/bobmodules/graphics/icons/quality-module-4.png b/bobmodules/graphics/icons/quality-module-4.png
diff --git a/bobmodules/graphics/icons/quality-module-5.png b/bobmodules/graphics/icons/quality-module-5.png
diff --git a/bobmodules/graphics/icons/red-module-1.png b/bobmodules/graphics/icons/red-module-1.png
diff --git a/bobmodules/graphics/icons/red-module-2.png b/bobmodules/graphics/icons/red-module-2.png
diff --git a/bobmodules/graphics/icons/red-module-3.png b/bobmodules/graphics/icons/red-module-3.png
diff --git a/bobmodules/graphics/icons/red-module-4.png b/bobmodules/graphics/icons/red-module-4.png
diff --git a/bobmodules/graphics/icons/red-module-5.png b/bobmodules/graphics/icons/red-module-5.png
diff --git a/bobmodules/graphics/icons/red-yellow/red-yellow_01.png b/bobmodules/graphics/icons/red-yellow/red-yellow_01.png
diff --git a/bobmodules/graphics/icons/red-yellow/red-yellow_02.png b/bobmodules/graphics/icons/red-yellow/red-yellow_02.png
diff --git a/bobmodules/graphics/icons/red-yellow/red-yellow_03.png b/bobmodules/graphics/icons/red-yellow/red-yellow_03.png
diff --git a/bobmodules/graphics/icons/red-yellow/red-yellow_04.png b/bobmodules/graphics/icons/red-yellow/red-yellow_04.png
diff --git a/bobmodules/graphics/icons/red-yellow/red-yellow_05.png b/bobmodules/graphics/icons/red-yellow/red-yellow_05.png
diff --git a/bobmodules/graphics/icons/speed-module-1.png b/bobmodules/graphics/icons/speed-module-1.png
diff --git a/bobmodules/graphics/icons/speed-module-2.png b/bobmodules/graphics/icons/speed-module-2.png
diff --git a/bobmodules/graphics/icons/speed-module-3.png b/bobmodules/graphics/icons/speed-module-3.png
diff --git a/bobmodules/graphics/icons/speed-module-4.png b/bobmodules/graphics/icons/speed-module-4.png
diff --git a/bobmodules/graphics/icons/speed-module-5.png b/bobmodules/graphics/icons/speed-module-5.png
diff --git a/bobmodules/graphics/icons/yellow-module-1.png b/bobmodules/graphics/icons/yellow-module-1.png
diff --git a/bobmodules/graphics/icons/yellow-module-2.png b/bobmodules/graphics/icons/yellow-module-2.png
diff --git a/bobmodules/graphics/icons/yellow-module-3.png b/bobmodules/graphics/icons/yellow-module-3.png
diff --git a/bobmodules/graphics/icons/yellow-module-4.png b/bobmodules/graphics/icons/yellow-module-4.png
diff --git a/bobmodules/graphics/icons/yellow-module-5.png b/bobmodules/graphics/icons/yellow-module-5.png
diff --git a/bobmodules/graphics/icons/yellow/yellow_01.png b/bobmodules/graphics/icons/yellow/yellow_01.png
diff --git a/bobmodules/graphics/icons/yellow/yellow_02.png b/bobmodules/graphics/icons/yellow/yellow_02.png
diff --git a/bobmodules/graphics/icons/yellow/yellow_03.png b/bobmodules/graphics/icons/yellow/yellow_03.png
diff --git a/bobmodules/graphics/icons/yellow/yellow_04.png b/bobmodules/graphics/icons/yellow/yellow_04.png
diff --git a/bobmodules/graphics/icons/yellow/yellow_05.png b/bobmodules/graphics/icons/yellow/yellow_05.png
diff --git a/bobmodules/prototypes/item/module-merged.lua b/bobmodules/prototypes/item/module-merged.lua
@@ -1,10 +1,12 @@
 if settings.startup["bobmods-modules-enablegreenmodules"].value == true then
+  local module_color_map = {
+      ["green"] = { primary = util.color("95e26c"), secondary = util.color("2bff2b") },
+  }
   data:extend({
     {
       type = "module",
       name = "bob-green-module-1",
-      icon = "__bobmodules__/graphics/icons/green-module-1.png",
-      icon_size = 32,
+      icon = "__bobmodules__/graphics/icons/green/green_01.png",
       subgroup = "green-module",
       category = "green",
       tier = 1,
@@ -14,19 +16,15 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then
         pollution = -1 * bobmods.modules.PollutionBonus,
         consumption = -1 * bobmods.modules.ConsumptionBonus,
       },
-      beacon_tint = {
-        primary = { r = 0.8, g = 0.8, b = 0 },
-        secondary = { r = 1, g = 1, b = 0.37 },
-      },
+      beacon_tint = module_color_map["green"],
       art_style = "vanilla",
       requires_beacon_alt_mode = false,
     },
 
     {
       type = "module",
       name = "bob-green-module-2",
-      icon = "__bobmodules__/graphics/icons/green-module-2.png",
-      icon_size = 32,
+      icon = "__bobmodules__/graphics/icons/green/green_02.png",
       subgroup = "green-module",
       category = "green",
       tier = 2,
@@ -36,19 +34,15 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then
         pollution = -1 * bobmods.modules.PollutionPerLevel - bobmods.modules.PollutionBonus,
         consumption = -1 * bobmods.modules.ConsumptionPerLevel - bobmods.modules.ConsumptionBonus,
       },
-      beacon_tint = {
-        primary = { r = 0.8, g = 0.8, b = 0 },
-        secondary = { r = 1, g = 1, b = 0.37 },
-      },
+      beacon_tint = module_color_map["green"],
       art_style = "vanilla",
       requires_beacon_alt_mode = false,
     },
 
     {
       type = "module",
       name = "bob-green-module-3",
-      icon = "__bobmodules__/graphics/icons/green-module-3.png",
-      icon_size = 32,
+      icon = "__bobmodules__/graphics/icons/green/green_03.png",
       subgroup = "green-module",
       category = "green",
       tier = 3,
@@ -58,19 +52,15 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then
         pollution = -2 * bobmods.modules.PollutionPerLevel - bobmods.modules.PollutionBonus,
         consumption = -2 * bobmods.modules.ConsumptionPerLevel - bobmods.modules.ConsumptionBonus,
       },
-      beacon_tint = {
-        primary = { r = 0.8, g = 0.8, b = 0 },
-        secondary = { r = 1, g = 1, b = 0.37 },
-      },
+      beacon_tint = module_color_map["green"],
       art_style = "vanilla",
       requires_beacon_alt_mode = false,
     },
 
     {
       type = "module",
       name = "bob-green-module-4",
-      icon = "__bobmodules__/graphics/icons/green-module-4.png",
-      icon_size = 32,
+      icon = "__bobmodules__/graphics/icons/green/green_04.png",
       subgroup = "green-module",
       category = "green",
       tier = 4,
@@ -80,19 +70,15 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then
         pollution = -3 * bobmods.modules.PollutionPerLevel - bobmods.modules.PollutionBonus,
         consumption = -3 * bobmods.modules.ConsumptionPerLevel - bobmods.modules.ConsumptionBonus,
       },
-      beacon_tint = {
-        primary = { r = 0.8, g = 0.8, b = 0 },
-        secondary = { r = 1, g = 1, b = 0.37 },
-      },
+      beacon_tint = module_color_map["green"],
       art_style = "vanilla",
       requires_beacon_alt_mode = false,
     },
 
     {
       type = "module",
       name = "bob-green-module-5",
-      icon = "__bobmodules__/graphics/icons/green-module-5.png",
-      icon_size = 32,
+      icon = "__bobmodules__/graphics/icons/green/green_05.png",
       subgroup = "green-module",
       category = "green",
       tier = 5,
@@ -102,10 +88,7 @@ if settings.startup["bobmods-modules-enablegreenmodules"].value == true then
         pollution = -4 * bobmods.modules.PollutionPerLevel - bobmods.modules.PollutionBonus,
         consumption = -4 * bobmods.modules.ConsumptionPerLevel - bobmods.modules.ConsumptionBonus,
       },
-      beacon_tint = {
-        primary = { r = 0.8, g = 0.8, b = 0 },
-        secondary = { r = 1, g = 1, b = 0.37 },
-      },
+      beacon_tint = module_color_map["green"],
       art_style = "vanilla",
       requires_beacon_alt_mode = false,
     },