Smaller storage

core/src/mindustry/content/Blocks.java

@@ -2611,7 +2611,7 @@ public class Blocks{
             isFirstTier = true;
             unitType = UnitTypes.evoke;
             health = 7000;
-            itemCapacity = 8000;
+            itemCapacity = 2000;
             size = 4;
             thrusterLength = 34/4f;
             armor = 5f;
@@ -2629,7 +2629,7 @@ public class Blocks{
 
             unitType = UnitTypes.incite;
             health = 18000;
-            itemCapacity = 11000;
+            itemCapacity = 3000;
             size = 5;
             thrusterLength = 40/4f;
             armor = 10f;
@@ -2645,7 +2645,7 @@ public class Blocks{
 
             unitType = UnitTypes.emanate;
             health = 30000;
-            itemCapacity = 16000;
+            itemCapacity = 4000;
             size = 6;
             thrusterLength = 48/4f;
             armor = 15f;
@@ -2677,18 +2677,19 @@ public class Blocks{
         }};
 
         reinforcedContainer = new StorageBlock("reinforced-container"){{
-            requirements(Category.effect, with(Items.tungsten, 100, Items.graphite, 50, Items.beryllium, 50));
+            requirements(Category.effect, with(Items.tungsten, 80, Items.graphite, 80));
-            size = 3;
+            size = 2;
-            //TODO should it really be kept the same, at 1000?
+            itemCapacity = 250;
-            itemCapacity = 1200;
             scaledHealth = 120;
+            coreMerge = false;
         }};
 
         reinforcedVault = new StorageBlock("reinforced-vault"){{
-            requirements(Category.effect, with(Items.tungsten, 250, Items.carbide, 125, Items.beryllium, 100));
+            requirements(Category.effect, with(Items.tungsten, 125, Items.thorium, 70, Items.beryllium, 100));
-            size = 4;
+            size = 3;
-            itemCapacity = 2500;
+            itemCapacity = 900;
             scaledHealth = 120;
+            coreMerge = false;
         }};
 
         //endregion

core/src/mindustry/world/blocks/storage/CoreBlock.java

@@ -104,7 +104,7 @@ public class CoreBlock extends StorageBlock{
     public void init(){
         //assign to update clipSize internally
         lightRadius = 30f + 20f * size;
-        fogRadius = Math.max(fogRadius, (int)(lightRadius / 8f * 2.5f));
+        fogRadius = Math.max(fogRadius, (int)(lightRadius / 8f * 2f));
         emitLight = true;
 
         super.init();
@@ -434,7 +434,7 @@ public class CoreBlock extends StorageBlock{
         }
 
         public boolean owns(Building core, Building tile){
-            return tile instanceof StorageBuild b && (b.linkedCore == core || b.linkedCore == null);
+            return tile instanceof StorageBuild b && ((StorageBlock)b.block).coreMerge && (b.linkedCore == core || b.linkedCore == null);
         }
 
         @Override

core/src/mindustry/world/blocks/storage/StorageBlock.java

@@ -13,6 +13,7 @@ import mindustry.world.meta.*;
 import static mindustry.Vars.*;
 
 public class StorageBlock extends Block{
+    public boolean coreMerge = true;
 
     public StorageBlock(String name){
         super(name);