Merge pull request #979 from KiwiHawk/OreSortingFacility5

Ore sorting facility 5
Arch666Angel · May 8, 2024 · 0aaa450 · 0aaa450
2 parents 79e8c0f + 550b702
commit 0aaa450
Show file tree

Hide file tree

Showing 17 changed files with 184 additions and 34 deletions.
diff --git a/angelspetrochem/prototypes/override/angelspetrochem.lua b/angelspetrochem/prototypes/override/angelspetrochem.lua
@@ -311,10 +311,6 @@ OV.disable_recipe({
 -- SULFURIC ACID ------------------------------------------------------------
 -----------------------------------------------------------------------------
 if angelsmods.trigger.early_sulfuric_acid == true then
-  -- Replace base game sulfur tech early
-  -- Else bob's library technology prerequisite cleanup will cause issues
-  OV.global_replace_technology("sulfur-processing", "angels-sulfur-processing-1")
-
   -- Sulfur 1
   OV.set_science_pack("angels-sulfur-processing-1", "logistic-science-pack", 0)
 

diff --git a/angelspetrochem/prototypes/override/angelsrefining.lua b/angelspetrochem/prototypes/override/angelsrefining.lua
@@ -55,6 +55,8 @@ if angelsmods.refining then
   OV.remove_prereq("ore-floatation", "automation-2")
   OV.remove_prereq("ore-floatation", "water-treatment")
   OV.add_prereq("ore-floatation", "basic-chemistry-3")
+  OV.remove_prereq("water-treatment-2", "slag-processing-1")
+  OV.add_prereq("water-treatment-2", "angels-coal-processing-2")
 end
 
 -------------------------------------------------------------------------------

diff --git a/angelspetrochem/prototypes/override/base-game.lua b/angelspetrochem/prototypes/override/base-game.lua
@@ -69,6 +69,7 @@ if angelsmods.trigger.early_sulfuric_acid == true then
   OV.remove_prereq("battery", "sulfur-processing")
   OV.add_prereq("battery", "angels-sulfur-processing-2")
 end
+OV.remove_prereq("sulfur-processing", "oil-processing")
 
 move_item("explosives", "petrochem-solids", "b[petrochem-solids-2]-a[explosives]")
 if angelsmods.trigger.early_sulfuric_acid == true then

diff --git a/angelspetrochem/prototypes/technology/petrochem-basic-chemistry.lua b/angelspetrochem/prototypes/technology/petrochem-basic-chemistry.lua
@@ -248,8 +248,7 @@ data:extend({
     icons = angelsmods.functions.create_gas_tech_icon({ { 067, 067, 067 }, { 056, 056, 056 }, { 045, 045, 045 } }),
     prerequisites = {
       "angels-coal-processing",
-      --"basic-chemistry-3",
-      "water-treatment-2",
+      "basic-chemistry-3",
     },
     effects = {
       {

diff --git a/angelsrefining/changelog.txt b/angelsrefining/changelog.txt
@@ -3,6 +3,8 @@ Version: 0.12.8
 Date: ???
   Bugfixes:
     - Fixed when placing an electric offshore waterpump over its ghost, the module request would be forgotten (973)
+  Changes:
+    - Added Ore Sorting Facility 5. Catalyst sorting requires a higher tier ore sorting facility (979)
 ---------------------------------------------------------------------------------------------------
 Version: 0.12.7
 Date: 21.02.2024

diff --git a/angelsrefining/locale/en/ore-refining.cfg b/angelsrefining/locale/en/ore-refining.cfg
@@ -31,6 +31,7 @@ ore-sorting-facility=Ore sorting facility 1
 ore-sorting-facility-2=Ore sorting facility 2
 ore-sorting-facility-3=Ore sorting facility 3
 ore-sorting-facility-4=Ore sorting facility 4
+ore-sorting-facility-5=Ore sorting facility 5
 
 liquifier=Liquefier 1
 liquifier-2=Liquefier 2

diff --git a/angelsrefining/prototypes/buildings/ore-sorting-facility.lua b/angelsrefining/prototypes/buildings/ore-sorting-facility.lua
@@ -38,7 +38,7 @@ data:extend({
     },
     allowed_effects = { "consumption", "speed", "pollution", "productivity" },
     crafting_categories = { "ore-sorting" },
-    crafting_speed = 0.75,
+    crafting_speed = 0.5,
     energy_source = {
       type = "electric",
       usage_priority = "secondary-input",
@@ -143,7 +143,7 @@ data:extend({
     },
     allowed_effects = { "consumption", "speed", "pollution", "productivity" },
     crafting_categories = { "ore-sorting", "ore-sorting-2" },
-    crafting_speed = 1,
+    crafting_speed = 0.75,
     energy_source = {
       type = "electric",
       usage_priority = "secondary-input",
@@ -248,7 +248,7 @@ data:extend({
     },
     allowed_effects = { "consumption", "speed", "pollution", "productivity" },
     crafting_categories = { "ore-sorting", "ore-sorting-2", "ore-sorting-3" },
-    crafting_speed = 1.5,
+    crafting_speed = 1,
     energy_source = {
       type = "electric",
       usage_priority = "secondary-input",
@@ -342,6 +342,7 @@ data:extend({
     flags = { "placeable-neutral", "player-creation" },
     minable = { mining_time = 1, result = "ore-sorting-facility-4" },
     fast_replaceable_group = "ore-sorting-facility",
+    next_upgrade = "ore-sorting-facility-5",
     max_health = 300,
     corpse = "big-remnants",
     dying_explosion = "medium-explosion",
@@ -352,7 +353,7 @@ data:extend({
     },
     allowed_effects = { "consumption", "speed", "pollution", "productivity" },
     crafting_categories = { "ore-sorting", "ore-sorting-2", "ore-sorting-3", "ore-sorting-4" },
-    crafting_speed = 2,
+    crafting_speed = 1.5,
     energy_source = {
       type = "electric",
       usage_priority = "secondary-input",
@@ -418,4 +419,107 @@ data:extend({
       apparent_volume = 2.5,
     },
   },
+  {
+    type = "item",
+    name = "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 = "ore-sorting-facility-5",
+    stack_size = 10,
+  },
+  {
+    type = "assembling-machine",
+    name = "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 = "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,
+    },
+  },
 })
diff --git a/angelsrefining/prototypes/recipe-builder-fallbacks.lua b/angelsrefining/prototypes/recipe-builder-fallbacks.lua
@@ -221,6 +221,7 @@ angelsmods.functions.RB.set_fallback("item", "sorter-1", { { "block-production-1
 angelsmods.functions.RB.set_fallback("item", "sorter-2", { { "block-production-2", 5 }, { "ore-sorting-facility" } })
 angelsmods.functions.RB.set_fallback("item", "sorter-3", { { "block-mprocessing-3", 5 }, { "ore-sorting-facility-2" } })
 angelsmods.functions.RB.set_fallback("item", "sorter-4", { { "block-mprocessing-4", 5 }, { "ore-sorting-facility-3" } })
+angelsmods.functions.RB.set_fallback("item", "sorter-5", { { "block-mprocessing-5", 5 }, { "ore-sorting-facility-4" } })
 
 angelsmods.functions.RB.set_fallback("item", "filter-1", { { "block-production-2", 3 } })
 angelsmods.functions.RB.set_fallback("item", "filter-2", { { "block-production-3", 3 }, { "filtration-unit" } })

diff --git a/angelsrefining/prototypes/recipes/refining-dynamic/chunk-processing.lua b/angelsrefining/prototypes/recipes/refining-dynamic/chunk-processing.lua
@@ -5,7 +5,7 @@ data:extend({
   {
     type = "recipe",
     name = "angelsore1-chunk-processing",
-    category = "ore-sorting",
+    category = "ore-sorting-2",
     subgroup = "ore-sorting-t2",
     energy_required = 1.5,
     enabled = false,
@@ -32,7 +32,7 @@ data:extend({
   {
     type = "recipe",
     name = "angelsore2-chunk-processing",
-    category = "ore-sorting",
+    category = "ore-sorting-2",
     subgroup = "ore-sorting-t2",
     energy_required = 1.5,
     enabled = false,
@@ -59,7 +59,7 @@ data:extend({
   {
     type = "recipe",
     name = "angelsore3-chunk-processing",
-    category = "ore-sorting",
+    category = "ore-sorting-2",
     subgroup = "ore-sorting-t2",
     energy_required = 1.5,
     enabled = false,
@@ -86,7 +86,7 @@ data:extend({
   {
     type = "recipe",
     name = "angelsore4-chunk-processing",
-    category = "ore-sorting",
+    category = "ore-sorting-2",
     subgroup = "ore-sorting-t2",
     energy_required = 1.5,
     enabled = false,
@@ -113,7 +113,7 @@ data:extend({
   {
     type = "recipe",
     name = "angelsore5-chunk-processing",
-    category = "ore-sorting",
+    category = "ore-sorting-2",
     subgroup = "ore-sorting-t2",
     energy_required = 1.5,
     enabled = false,
@@ -140,7 +140,7 @@ data:extend({
   {
     type = "recipe",
     name = "angelsore6-chunk-processing",
-    category = "ore-sorting",
+    category = "ore-sorting-2",
     subgroup = "ore-sorting-t2",
     energy_required = 1.5,
     enabled = false,

diff --git a/angelsrefining/prototypes/recipes/refining-dynamic/crystal-processing.lua b/angelsrefining/prototypes/recipes/refining-dynamic/crystal-processing.lua
@@ -5,7 +5,7 @@ data:extend({
   {
     type = "recipe",
     name = "angelsore1-crystal-processing",
-    category = "ore-sorting-2",
+    category = "ore-sorting-3",
     subgroup = "ore-sorting-t3",
     energy_required = 2,
     enabled = false,
@@ -32,7 +32,7 @@ data:extend({
   {
     type = "recipe",
     name = "angelsore2-crystal-processing",
-    category = "ore-sorting-2",
+    category = "ore-sorting-3",
     subgroup = "ore-sorting-t3",
     energy_required = 2,
     enabled = false,
@@ -59,7 +59,7 @@ data:extend({
   {
     type = "recipe",
     name = "angelsore3-crystal-processing",
-    category = "ore-sorting-2",
+    category = "ore-sorting-3",
     subgroup = "ore-sorting-t3",
     energy_required = 2,
     enabled = false,
@@ -86,7 +86,7 @@ data:extend({
   {
     type = "recipe",
     name = "angelsore4-crystal-processing",
-    category = "ore-sorting-2",
+    category = "ore-sorting-3",
     subgroup = "ore-sorting-t3",
     energy_required = 2,
     enabled = false,
@@ -113,7 +113,7 @@ data:extend({
   {
     type = "recipe",
     name = "angelsore5-crystal-processing",
-    category = "ore-sorting-2",
+    category = "ore-sorting-3",
     subgroup = "ore-sorting-t3",
     energy_required = 2,
     enabled = false,
@@ -140,7 +140,7 @@ data:extend({
   {
     type = "recipe",
     name = "angelsore6-crystal-processing",
-    category = "ore-sorting-2",
+    category = "ore-sorting-3",
     subgroup = "ore-sorting-t3",
     energy_required = 2,
     enabled = false,

diff --git a/angelsrefining/prototypes/recipes/refining-dynamic/pure-processing-mix.lua b/angelsrefining/prototypes/recipes/refining-dynamic/pure-processing-mix.lua
@@ -5,7 +5,7 @@ data:extend({
   {
     type = "recipe",
     name = "angelsore-pure-mix1-processing", --tungsten
-    category = "ore-sorting-4",
+    category = "ore-sorting-5",
     subgroup = "ore-sorting-advanced",
     energy_required = 1.5,
     enabled = false,
@@ -38,7 +38,7 @@ data:extend({
   {
     type = "recipe",
     name = "angelsore-pure-mix2-processing", --platinum
-    category = "ore-sorting-4",
+    category = "ore-sorting-5",
     subgroup = "ore-sorting-advanced",
     energy_required = 1.5,
     enabled = false,
@@ -71,7 +71,7 @@ data:extend({
   {
     type = "recipe",
     name = "angelsore-pure-mix3-processing",
-    category = "ore-sorting-4",
+    category = "ore-sorting-5",
     subgroup = "ore-sorting-advanced",
     energy_required = 1.5,
     enabled = false,