Factoriopedia cleanup and fix icon sizes on belts

tburrows13 · tburrows13 · commit 7195f488f684 · 2025-02-07T16:45:26.000Z
diff --git a/locale/en/FreightForwarding.cfg b/locale/en/FreightForwarding.cfg
@@ -58,10 +58,12 @@ ff-interstellar-communicator=Can be launched in a rocket to win the game.
 ff-tailings-water=Tailings water
 
 [recipe-name]
+ff-ferrous-nodule-washing=Ferrous nodule washing
+ff-cupric-nodule-washing=Cupric nodule washing
+ff-cobalt-crust-washing=Cobalt crust washing
 ff-tailings-filtration=Tailings filtration
 ff-tailings-evaporation=Tailings evaporation
-ff-titansteel-smelting=Titansteel smelting
-ff-titansteel-cooling=Titansteel cooling
+ff-titansteel-heating=Titansteel heating
 ff-slag-leaching=Slag leaching
 ff-water-condensing=Water condensing
 ff-advanced-uranium-processing=Advanced uranium processing
diff --git a/migrations/pre-2.0.0.json b/migrations/pre-2.0.0.json
@@ -0,0 +1,9 @@
+{
+  "recipe":
+  [
+    ["ff-charge-battery", "ff-charged-battery"],
+    ["ff-charge-battery-pack", "ff-charged-battery-pack"],
+    ["ff-titansteel-cooling", "ff-titansteel-plate"],
+    ["ff-titansteel-smelting", "ff-hot-titansteel-plate"]
+  ]
+}
diff --git a/prototypes/battery-transport.lua b/prototypes/battery-transport.lua
@@ -307,7 +307,7 @@ data:extend{ -- Battery charging interface
   },
   {
     type = "recipe",
-    name = "ff-charge-battery",
+    name = "ff-charged-battery",
     category = "battery",
     --hide_from_player_crafting = true,
     energy_required = 5,
@@ -386,7 +386,7 @@ data:extend{ -- Battery charging interface
   },
   {
     type = "recipe",
-    name = "ff-charge-battery-pack",
+    name = "ff-charged-battery-pack",
     category = "battery",
     --hide_from_player_crafting = true,
     energy_required = 12.5,
@@ -424,7 +424,7 @@ data:extend{ -- Battery charging interface
       },
       {
         type = "unlock-recipe",
-        recipe = "ff-charge-battery"
+        recipe = "ff-charged-battery"
       },
     },
     prerequisites = {"electric-energy-accumulators"},
@@ -454,7 +454,7 @@ data:extend{ -- Battery charging interface
       },
       {
         type = "unlock-recipe",
-        recipe = "ff-charge-battery-pack"
+        recipe = "ff-charged-battery-pack"
       },
     },
     prerequisites = {"ff-battery-charging", "utility-science-pack", "ff-cobalt-processing"},
diff --git a/prototypes/cobalt.lua b/prototypes/cobalt.lua
@@ -115,6 +115,7 @@ data:extend{
         icon = "__FreightForwarding__/graphics/item/tailings-water.png",
         scale = 0.25,
         shift = {-8, -8},
+        draw_background = true,
       },
     },
     icon_size = 64,
@@ -148,16 +149,19 @@ data:extend{
         icon = "__FreightForwarding__/graphics/item/tailings-water.png",
         scale = 0.25,
         shift = {-8, -8},
+        draw_background = true,
       },
       {
         icon = "__bzlead__/graphics/icons/lead-ore.png",
         scale = 0.23,
         shift = {-8, 8},
+        draw_background = true,
       },
       {
         icon = "__bztitanium__/graphics/icons/titanium-ore.png",
         scale = 0.23,
         shift = {8, 8},
+        draw_background = true,
       },
     },
     icon_size = 64,
diff --git a/prototypes/endgame.lua b/prototypes/endgame.lua
@@ -40,15 +40,15 @@ data:extend{
         {
           size = 64,
           filename = "__FreightForwarding__/graphics/item/interstellar-communicator.png",
-          scale = 0.25,
+          scale = 0.5,
           mipmap_count = 4,
         },
         {
           draw_as_light = true,
           flags = { "light" },
           size = 64,
           filename = "__FreightForwarding__/graphics/item/interstellar-communicator-light.png",
-          scale = 0.25,
+          scale = 0.5,
           mipmap_count = 4,
         },
       },
diff --git a/prototypes/lava-pool.lua b/prototypes/lava-pool.lua
@@ -72,9 +72,9 @@ data:extend{
     icon = "__FreightForwarding__/graphics/lava-pool/lava-pool-icon.png",
     icon_size = 64,
     flags = {"placeable-neutral"},
-    category = "basic-fluid",
-    subgroup = "raw-resource",
-    order="a-b-a",
+    category = "ff-rocket-silo",  -- Empty category, so "Mined by:" will be empty
+    subgroup = "mineable-fluids",
+    order = "b-b",
     infinite = false,
     highlight = true,
     minimum = 1,
@@ -196,7 +196,7 @@ data:extend{
     },]]
     --map_color = {1, 0.4, 0},
     crafting_categories = {"ff-lava-smelting"},
-    fixed_recipe = "ff-titansteel-smelting",
+    fixed_recipe = "ff-hot-titansteel-plate",
     show_recipe_icon = false,
     crafting_speed = 1,
     energy_source = {type = "void"},
diff --git a/prototypes/nodule.lua b/prototypes/nodule.lua
@@ -24,7 +24,7 @@ data:extend{
   },
   {
     type = "recipe",
-    name = "ff-ferrous-nodule-washing",
+    name = "ff-ferrous-nodule-washing",  -- TODO 2.0 give unique icon
     category = "chemistry",
     enabled = false,
     energy_required = 15,
diff --git a/prototypes/rocket-silo.lua b/prototypes/rocket-silo.lua
@@ -16,6 +16,7 @@ local rocket_silo_dummy = table.deepcopy(rocket_silo)
 rocket_silo_dummy.name = "ff-rocket-silo-dummy"
 rocket_silo_dummy.localised_name = {"entity-name.rocket-silo"}
 rocket_silo_dummy.localised_description = rocket_silo.localised_description or {"entity-description.rocket-silo"}
+rocket_silo_dummy.hidden = true
 rocket_silo_dummy.type = "mining-drill"
 rocket_silo_dummy.collision_mask = {layers = {}}
 rocket_silo_dummy.vector_to_place_result = {0, 0}
@@ -68,8 +69,8 @@ data:extend{
     icon_size = 64,
     flags = {"placeable-neutral"},
     category = "ff-rocket-silo",
-    subgroup = "raw-resource",
-    order="a-b-c",
+    subgroup = "mineable-fluids",
+    order = "b-c",
     infinite = false,
     highlight = true,
     minimum = 100,  -- Doesn't do anything?
diff --git a/prototypes/seamount.lua b/prototypes/seamount.lua
@@ -24,8 +24,8 @@ data:extend{
     icon_size = 64,
     flags = {"placeable-neutral"},
     category = "ff-seamount",
-    subgroup = "raw-resource",
-    order="a-b-a",
+    subgroup = "mineable-fluids",
+    order = "b-a",
     infinite = false,
     highlight = true,
     minimum = 100,  -- Doesn't do anything?
diff --git a/prototypes/slag.lua b/prototypes/slag.lua
@@ -11,7 +11,7 @@ data:extend{
           {
             filename = "__FreightForwarding__/graphics/slag/hot-slag.png",
             mipmap_count = 4,
-            scale = 0.25,
+            scale = 0.5,
             size = 64
           },
           {
@@ -20,7 +20,7 @@ data:extend{
             -- blend_mode = "additive",
             flags = { "light" },
             mipmap_count = 4,
-            scale = 0.25,
+            scale = 0.5,
             size = 64
           }
         }
@@ -30,7 +30,7 @@ data:extend{
           {
             filename = "__FreightForwarding__/graphics/slag/hot-slag-1.png",
             mipmap_count = 4,
-            scale = 0.25,
+            scale = 0.5,
             size = 64
           },
           {
@@ -39,7 +39,7 @@ data:extend{
             -- blend_mode = "additive",
             flags = { "light" },
             mipmap_count = 4,
-            scale = 0.25,
+            scale = 0.5,
             size = 64
           }
         }
@@ -49,7 +49,7 @@ data:extend{
           {
             filename = "__FreightForwarding__/graphics/slag/hot-slag-2.png",
             mipmap_count = 4,
-            scale = 0.25,
+            scale = 0.5,
             size = 64
           },
           {
@@ -58,7 +58,7 @@ data:extend{
             -- blend_mode = "additive",
             flags = { "light" },
             mipmap_count = 4,
-            scale = 0.25,
+            scale = 0.5,
             size = 64
           }
         }
@@ -68,7 +68,7 @@ data:extend{
           {
             filename = "__FreightForwarding__/graphics/slag/hot-slag-3.png",
             mipmap_count = 4,
-            scale = 0.25,
+            scale = 0.5,
             size = 64
           },
           {
@@ -77,7 +77,7 @@ data:extend{
             -- blend_mode = "additive",
             flags = { "light" },
             mipmap_count = 4,
-            scale = 0.25,
+            scale = 0.5,
             size = 64
           }
         }
@@ -101,13 +101,15 @@ data:extend{
       },
       {
         icon = "__base__/graphics/icons/iron-ore.png",
-        scale = 0.25,
+        scale = 0.5,
         shift = {8, 8},
+        draw_background = true,
       },
       {
         icon = "__base__/graphics/icons/stone.png",
-        scale = 0.25,
+        scale = 0.5,
         shift = {-8, 8},
+        draw_background = true,
       },
     },
     icon_size = 64,
diff --git a/prototypes/titansteel.lua b/prototypes/titansteel.lua
@@ -10,27 +10,26 @@ data:extend{
   {
     type = "technology",
     name = "ff-titansteel-processing",
-    icon_size = 256,
-    --icon = "__base__/graphics/technology/steel-processing.png",
     icons = {
       {
         icon = "__base__/graphics/technology/steel-processing.png",
+        icon_size = 256,
         tint = { b = 0.4, g = 0.4, r = 0.4 }
       },
     },
     effects =
     {
       {
         type = "unlock-recipe",
-        recipe = "ff-titansteel-smelting"
+        recipe = "ff-hot-titansteel-plate"
       },
       {
         type = "unlock-recipe",
         recipe = "ff-titansteel-heating"
       },
       {
         type = "unlock-recipe",
-        recipe = "ff-titansteel-cooling"
+        recipe = "ff-titansteel-plate"
       },
       {
         type = "unlock-recipe",
@@ -60,7 +59,7 @@ data:extend{
   },
   {
     type = "recipe",
-    name = "ff-titansteel-smelting",
+    name = "ff-hot-titansteel-plate",
     category = "ff-lava-smelting",
     enabled = false,
     main_product = "ff-hot-titansteel-plate",
@@ -91,6 +90,7 @@ data:extend{
         icon_size = 64,
         scale = 0.32,
         shift = {-8, -8},
+        draw_background = true,
       },
     },
     category = "ff-lava-heating",
@@ -111,7 +111,7 @@ data:extend{
   },
   {
     type = "recipe",
-    name = "ff-titansteel-cooling",
+    name = "ff-titansteel-plate",
     category = "chemistry",
     main_product = "ff-titansteel-plate",
     enabled = false,
@@ -156,7 +156,7 @@ data:extend{
         {
           filename = "__FreightForwarding__/graphics/hot-titansteel.png",
           mipmap_count = 4,
-          scale = 0.25,
+          scale = 0.5,
           size = 64
         },
         {
@@ -165,7 +165,7 @@ data:extend{
           -- blend_mode = "additive",
           flags = { "light" },
           mipmap_count = 4,
-          scale = 0.25,
+          scale = 0.5,
           size = 64
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ data:extend{`
`24`	`24`	`},`
`25`	`25`	`{`
`26`	`26`	`type = "recipe",`
`27`		`- name = "ff-ferrous-nodule-washing",`
	`27`	`+ name = "ff-ferrous-nodule-washing", -- TODO 2.0 give unique icon`
`28`	`28`	`category = "chemistry",`
`29`	`29`	`enabled = false,`
`30`	`30`	`energy_required = 15,`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ data:extend{`
`11`	`11`	`{`
`12`	`12`	`filename = "__FreightForwarding__/graphics/slag/hot-slag.png",`
`13`	`13`	`mipmap_count = 4,`
`14`		`- scale = 0.25,`
	`14`	`+ scale = 0.5,`
`15`	`15`	`size = 64`
`16`	`16`	`},`
`17`	`17`	`{`
`@@ -20,7 +20,7 @@ data:extend{`
`20`	`20`	`-- blend_mode = "additive",`
`21`	`21`	`flags = { "light" },`
`22`	`22`	`mipmap_count = 4,`
`23`		`- scale = 0.25,`
	`23`	`+ scale = 0.5,`
`24`	`24`	`size = 64`
`25`	`25`	`}`
`26`	`26`	`}`
`@@ -30,7 +30,7 @@ data:extend{`
`30`	`30`	`{`
`31`	`31`	`filename = "__FreightForwarding__/graphics/slag/hot-slag-1.png",`
`32`	`32`	`mipmap_count = 4,`
`33`		`- scale = 0.25,`
	`33`	`+ scale = 0.5,`
`34`	`34`	`size = 64`
`35`	`35`	`},`
`36`	`36`	`{`
`@@ -39,7 +39,7 @@ data:extend{`
`39`	`39`	`-- blend_mode = "additive",`
`40`	`40`	`flags = { "light" },`
`41`	`41`	`mipmap_count = 4,`
`42`		`- scale = 0.25,`
	`42`	`+ scale = 0.5,`
`43`	`43`	`size = 64`
`44`	`44`	`}`
`45`	`45`	`}`
`@@ -49,7 +49,7 @@ data:extend{`
`49`	`49`	`{`
`50`	`50`	`filename = "__FreightForwarding__/graphics/slag/hot-slag-2.png",`
`51`	`51`	`mipmap_count = 4,`
`52`		`- scale = 0.25,`
	`52`	`+ scale = 0.5,`
`53`	`53`	`size = 64`
`54`	`54`	`},`
`55`	`55`	`{`
`@@ -58,7 +58,7 @@ data:extend{`
`58`	`58`	`-- blend_mode = "additive",`
`59`	`59`	`flags = { "light" },`
`60`	`60`	`mipmap_count = 4,`
`61`		`- scale = 0.25,`
	`61`	`+ scale = 0.5,`
`62`	`62`	`size = 64`
`63`	`63`	`}`
`64`	`64`	`}`
`@@ -68,7 +68,7 @@ data:extend{`
`68`	`68`	`{`
`69`	`69`	`filename = "__FreightForwarding__/graphics/slag/hot-slag-3.png",`
`70`	`70`	`mipmap_count = 4,`
`71`		`- scale = 0.25,`
	`71`	`+ scale = 0.5,`
`72`	`72`	`size = 64`
`73`	`73`	`},`
`74`	`74`	`{`
`@@ -77,7 +77,7 @@ data:extend{`
`77`	`77`	`-- blend_mode = "additive",`
`78`	`78`	`flags = { "light" },`
`79`	`79`	`mipmap_count = 4,`
`80`		`- scale = 0.25,`
	`80`	`+ scale = 0.5,`
`81`	`81`	`size = 64`
`82`	`82`	`}`
`83`	`83`	`}`
`@@ -101,13 +101,15 @@ data:extend{`
`101`	`101`	`},`
`102`	`102`	`{`
`103`	`103`	`icon = "__base__/graphics/icons/iron-ore.png",`
`104`		`- scale = 0.25,`
	`104`	`+ scale = 0.5,`
`105`	`105`	`shift = {8, 8},`
	`106`	`+ draw_background = true,`
`106`	`107`	`},`
`107`	`108`	`{`
`108`	`109`	`icon = "__base__/graphics/icons/stone.png",`
`109`		`- scale = 0.25,`
	`110`	`+ scale = 0.5,`
`110`	`111`	`shift = {-8, 8},`
	`112`	`+ draw_background = true,`
`111`	`113`	`},`
`112`	`114`	`},`
`113`	`115`	`icon_size = 64,`