Remove Ore sorting facility 5 (#328)

* Remove Ore Sorting Facility 5 #327 * Format Code --------- Co-authored-by: StyLuaFormatter <KiwiHawk@users.noreply.github.com>
modded-factorio · Jun 8, 2024 · 2fb5151 · 2fb5151
1 parent 0f26bdc
commit 2fb5151
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 198 deletions.
diff --git a/SeaBlock/changelog.txt b/SeaBlock/changelog.txt
@@ -3,6 +3,9 @@ Version: 0.5.17
 Date: ??.??.??
   Changes:
     - Added custom Better Victory Screen statistics #323
+    - Handle Ore Sorting Facility 5 changes #327
+      - Stop creating recipe, item, and entity in Sea Block
+      - Added migration of removed Sea Block item and entity to new Angel's item and entity
 ---------------------------------------------------------------------------------------------------
 Version: 0.5.16
 Date: 27.02.2024

diff --git a/SeaBlock/data-updates/slag-processing.lua b/SeaBlock/data-updates/slag-processing.lua
@@ -88,99 +88,10 @@ data.raw.technology["slag-processing-1"].unit = {
   time = 15,
 }
 
-if data.raw["assembling-machine"]["ore-sorting-facility-4"] then
-  data.raw["assembling-machine"]["ore-sorting-facility-4"].next_upgrade = "sb-ore-sorting-facility-5"
-end
-
 bobmods.lib.tech.add_prerequisite("advanced-ore-refining-2", "ore-powderizer")
 bobmods.lib.tech.add_prerequisite("advanced-ore-refining-2", "advanced-electronics")
 bobmods.lib.tech.add_prerequisite("advanced-ore-refining-4", "advanced-electronics-3")
 bobmods.lib.tech.add_prerequisite("advanced-ore-refining-4", "angels-tungsten-smelting-1")
-seablock.lib.add_recipe_unlock("advanced-ore-refining-4", "sb-ore-sorting-facility-5", 3)
-
-local buildingmulti = angelsmods.marathon.buildingmulti
-local buildingtime = angelsmods.marathon.buildingtime
-
-angelsmods.functions.RB.build({
-  {
-    type = "recipe",
-    name = "sb-ore-sorting-facility-5",
-    normal = {
-      energy_required = 5,
-      enabled = false,
-      ingredients = {
-        { type = "item", name = "ore-sorting-facility-4", amount = 1 },
-        { type = "item", name = "t5-plate", amount = 12 },
-        { type = "item", name = "t5-circuit", amount = 12 },
-        { type = "item", name = "t5-brick", amount = 12 },
-        { type = "item", name = "t5-gears", amount = 8 },
-      },
-      result = "sb-ore-sorting-facility-5",
-    },
-    expensive = {
-      energy_required = 5 * buildingtime,
-      enabled = false,
-      ingredients = {
-        { type = "item", name = "ore-sorting-facility-4", amount = 1 },
-        { type = "item", name = "t5-plate", amount = 12 * buildingmulti },
-        { type = "item", name = "t5-circuit", amount = 12 * buildingmulti },
-        { type = "item", name = "t5-brick", amount = 12 * buildingmulti },
-        { type = "item", name = "t5-gears", amount = 8 * buildingmulti },
-      },
-      result = "sb-ore-sorting-facility-5",
-    },
-  },
-})
-
--- Make ore sorting recipes require a higher tier ore sorting facility
-for _, v in pairs({
-  "angelsore1-chunk-processing",
-  "angelsore2-chunk-processing",
-  "angelsore3-chunk-processing",
-  "angelsore4-chunk-processing",
-  "angelsore5-chunk-processing",
-  "angelsore6-chunk-processing",
-}) do
-  bobmods.lib.recipe.set_category(v, "ore-sorting-2")
-end
-bobmods.lib.tech.add_prerequisite("ore-floatation", "advanced-ore-refining-1")
-
-for _, v in pairs({
-  "angelsore1-crystal-processing",
-  "angelsore2-crystal-processing",
-  "angelsore3-crystal-processing",
-  "angelsore4-crystal-processing",
-  "angelsore5-crystal-processing",
-  "angelsore6-crystal-processing",
-}) do
-  bobmods.lib.recipe.set_category(v, "ore-sorting-3")
-end
-bobmods.lib.tech.add_prerequisite("ore-leaching", "advanced-ore-refining-2")
-
-for _, v in pairs({
-  "angelsore1-pure-processing",
-  "angelsore2-pure-processing",
-  "angelsore3-pure-processing",
-  "angelsore4-pure-processing",
-  "angelsore5-pure-processing",
-  "angelsore6-pure-processing",
-}) do
-  bobmods.lib.recipe.set_category(v, "ore-sorting-4")
-end
-bobmods.lib.tech.add_prerequisite("ore-refining", "advanced-ore-refining-3")
-
-for _, v in pairs({
-  "angelsore-pure-mix1-processing",
-  "angelsore-pure-mix2-processing",
-}) do
-  bobmods.lib.recipe.set_category(v, "ore-sorting-5")
-end
-
--- Slow down Ore Sorting Facilities to make space for our new top tier
-data.raw["assembling-machine"]["ore-sorting-facility"].crafting_speed = 0.5
-data.raw["assembling-machine"]["ore-sorting-facility-2"].crafting_speed = 0.75
-data.raw["assembling-machine"]["ore-sorting-facility-3"].crafting_speed = 1.0
-data.raw["assembling-machine"]["ore-sorting-facility-4"].crafting_speed = 1.5
 
 -- Add an additional slag to the mixed sorting recipes
 for _, v in pairs({

diff --git a/SeaBlock/info.json b/SeaBlock/info.json
@@ -11,7 +11,7 @@
     "base",
     "angelsbioprocessing >= 0.7.23",
     "angelspetrochem >= 0.9.23",
-    "angelsrefining >= 0.12.3",
+    "angelsrefining >= 0.12.8",
     "angelssmelting >= 0.6.20",
     "bobelectronics >= 1.1.6",
     "boblibrary >= 1.1.6",

diff --git a/SeaBlock/locale/en/SeaBlock.cfg b/SeaBlock/locale/en/SeaBlock.cfg
@@ -22,7 +22,6 @@ sct-lab-lab2=Exoplanetary Studies Lab
 
 [entity-name]
 home=Home
-sb-ore-sorting-facility-5=Ore sorting facility 5
 sct-lab-lab2=Exoplanetary Studies Lab
 silo-coal=Charcoal silo
 

diff --git a/SeaBlock/migrations/SeaBlock_0.5.17.json b/SeaBlock/migrations/SeaBlock_0.5.17.json
@@ -0,0 +1,10 @@
+{
+  "entity":
+  [
+    ["sb-ore-sorting-facility-5", "ore-sorting-facility-5"]
+  ],
+  "item":
+  [
+    ["sb-ore-sorting-facility-5", "ore-sorting-facility-5"]
+  ]
+}
diff --git a/SeaBlock/prototypes/recipe-category.lua b/SeaBlock/prototypes/recipe-category.lua
@@ -11,10 +11,6 @@ data:extend({
     type = "recipe-category",
     name = "thermal-extractor",
   },
-  {
-    type = "recipe-category",
-    name = "ore-sorting-5",
-  },
 })
 
 if mods["SpaceMod"] then

diff --git a/SeaBlock/prototypes/recipe.lua b/SeaBlock/prototypes/recipe.lua
@@ -120,109 +120,6 @@ data:extend({
     subgroup = "bio-processing-blue",
     order = "d[blue-algae-liquefaction]",
   },
-  {
-    type = "item",
-    name = "sb-ore-sorting-facility-5",
-    icons = angelsmods.functions.add_number_icon_layer({
-      {
-        icon = "__angelsrefining__/graphics/icons/ore-sorting-facility.png",
-        icon_size = 64,
-        icon_mipmaps = 4,
-      },
-    }, 5, angelsmods.refining.number_tint),
-    subgroup = "ore-sorter",
-    order = "e[ore-sorting-facility-5]",
-    place_result = "sb-ore-sorting-facility-5",
-    stack_size = 10,
-  },
-  {
-    type = "assembling-machine",
-    name = "sb-ore-sorting-facility-5",
-    icons = angelsmods.functions.add_number_icon_layer({
-      {
-        icon = "__angelsrefining__/graphics/icons/ore-sorting-facility.png",
-        icon_size = 64,
-        icon_mipmaps = 4,
-      },
-    }, 5, angelsmods.refining.number_tint),
-    flags = { "placeable-neutral", "player-creation" },
-    minable = { mining_time = 1, result = "sb-ore-sorting-facility-5" },
-    fast_replaceable_group = "ore-sorting-facility",
-    max_health = 300,
-    corpse = "big-remnants",
-    dying_explosion = "medium-explosion",
-    collision_box = { { -3.4, -3.4 }, { 3.4, 3.4 } },
-    selection_box = { { -3.5, -3.5 }, { 3.5, 3.5 } },
-    module_specification = {
-      module_slots = 3,
-    },
-    allowed_effects = { "consumption", "speed", "pollution", "productivity" },
-    crafting_categories = { "ore-sorting", "ore-sorting-2", "ore-sorting-3", "ore-sorting-4", "ore-sorting-5" },
-    crafting_speed = 2,
-    energy_source = {
-      type = "electric",
-      usage_priority = "secondary-input",
-      emissions_per_minute = 0.07 * 60,
-    },
-    energy_usage = "350kW",
-    animation = {
-      layers = {
-        {
-          filename = "__angelsrefining__/graphics/entity/ore-sorting-facility/ore-sorting-facility-base.png",
-          priority = "extra-high",
-          width = 224,
-          height = 230,
-          frame_count = 40,
-          line_length = 10,
-          shift = util.by_pixel(0, -2),
-          animation_speed = 0.5,
-          hr_version = angelsmods.trigger.enable_hq_graphics
-              and {
-                filename = "__angelsrefining__/graphics/entity/ore-sorting-facility/hr-ore-sorting-facility-base.png",
-                priority = "extra-high",
-                width = 449,
-                height = 458,
-                frame_count = 40,
-                line_length = 10,
-                shift = util.by_pixel(0, -2.5),
-                animation_speed = 0.5,
-                scale = 0.5,
-              }
-            or nil,
-        },
-        {
-          filename = "__angelsrefining__/graphics/entity/ore-sorting-facility/ore-sorting-facility-shadow.png",
-          priority = "extra-high",
-          width = 265,
-          height = 179,
-          repeat_count = 40,
-          shift = util.by_pixel(21, 25),
-          animation_speed = 0.5,
-          draw_as_shadow = true,
-          hr_version = angelsmods.trigger.enable_hq_graphics
-              and {
-                filename = "__angelsrefining__/graphics/entity/ore-sorting-facility/hr-ore-sorting-facility-shadow.png",
-                priority = "extra-high",
-                width = 528,
-                height = 356,
-                repeat_count = 40,
-                shift = util.by_pixel(21.5, 24.5),
-                animation_speed = 0.5,
-                draw_as_shadow = true,
-                scale = 0.5,
-              }
-            or nil,
-        },
-      },
-    },
-    vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 },
-    working_sound = {
-      sound = { filename = "__angelsrefining__/sound/ore-sorting-facility.ogg", volume = 0.5 },
-      idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 },
-      audible_distance_modifier = 0.5,
-      apparent_volume = 2.5,
-    },
-  },
   {
     type = "recipe",
     name = "sb-ore-sorting-facility-5",