From 22332b53c2844e8307eaa7a5cd2e1309c3d7cf64 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 9 Apr 2022 10:36:20 -0400
Subject: [PATCH] Environment bugfixes

---
 core/src/mindustry/content/Blocks.java | 6 +++---
 core/src/mindustry/content/Items.java  | 5 ++++-
 core/src/mindustry/game/Rules.java     | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index b7e74cd5b5..6bfc20aa0b 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1624,7 +1624,7 @@ public class Blocks{
         }};
 
         carbideWallLarge = new Wall("carbide-wall-large"){{
-            requirements(Category.defense, ItemStack.mult(thoriumWall.requirements, 4));
+            requirements(Category.defense, ItemStack.mult(carbideWall.requirements, 4));
             health = 240 * wallHealthMultiplier * 4;
             armor = 16f;
             size = 2;
@@ -1950,7 +1950,7 @@ public class Blocks{
         }};
 
         unitCargoLoader = new UnitCargoLoader("unit-cargo-loader"){{
-            requirements(Category.distribution, with(Items.silicon, 80, Items.phaseFabric, 60, Items.carbide, 50, Items.oxide, 40));
+            requirements(Category.distribution, with(Items.silicon, 80, Items.carbide, 50, Items.oxide, 50));
 
             size = 3;
             buildTime = 60f * 8f;
@@ -1964,7 +1964,7 @@ public class Blocks{
         }};
 
         unitCargoUnloadPoint = new UnitCargoUnloadPoint("unit-cargo-unload-point"){{
-            requirements(Category.distribution, with(Items.silicon, 60, Items.thorium, 80));
+            requirements(Category.distribution, with(Items.silicon, 60, Items.tungsten, 60));
 
             size = 2;
 
diff --git a/core/src/mindustry/content/Items.java b/core/src/mindustry/content/Items.java
index 318bf4912f..6ff6721305 100644
--- a/core/src/mindustry/content/Items.java
+++ b/core/src/mindustry/content/Items.java
@@ -11,7 +11,7 @@ public class Items{
     beryllium, tungsten, oxide, carbide, fissileMatter, dormantCyst;
 
     //TODO remove, these are for debugging only
-    public static final Seq<Item> serpuloItems = new Seq<>(), erekirItems = new Seq<>();
+    public static final Seq<Item> serpuloItems = new Seq<>(), erekirItems = new Seq<>(), erekirOnlyItems = new Seq<>();
 
     public static void load(){
         copper = new Item("copper", Color.valueOf("d99d73")){{
@@ -145,5 +145,8 @@ public class Items{
         graphite, thorium, silicon, phaseFabric, surgeAlloy, sand,
         beryllium, tungsten, oxide, carbide, fissileMatter, dormantCyst
         );
+
+        erekirOnlyItems.addAll(erekirItems).removeAll(serpuloItems);
+
     }
 }
diff --git a/core/src/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java
index 1b51b16b16..581415a87e 100644
--- a/core/src/mindustry/game/Rules.java
+++ b/core/src/mindustry/game/Rules.java
@@ -112,7 +112,7 @@ public class Rules{
     /** Unlocked content names. Only used in multiplayer when the campaign is enabled. */
     public ObjectSet<String> researched = new ObjectSet<>();
     /** Block containing these items as requirements are hidden. */
-    public ObjectSet<Item> hiddenBuildItems = new ObjectSet<>();
+    public ObjectSet<Item> hiddenBuildItems = Items.erekirOnlyItems.asSet();
     /** HIGHLY UNSTABLE/EXPERIMENTAL. DO NOT USE THIS. */
     public boolean fog = false;
     /** If fog = true, this is whether static (black) fog is enabled. */