From 75606baf6a6658c2ea8909e2283ac240b4abc6c1 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 14 Aug 2020 14:32:03 -0400 Subject: [PATCH] Cleanup --- core/assets/bundles/bundle.properties | 7 +++++++ core/src/mindustry/content/Blocks.java | 2 +- core/src/mindustry/world/blocks/logic/MemoryBlock.java | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 4b8026df80..4cc3ce16aa 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1084,6 +1084,13 @@ block.payload-router.name = Payload Router block.disassembler.name = Disassembler block.silicon-crucible.name = Silicon Crucible block.overdrive-dome.name = Overdrive Dome + +block.switch.name = Switch +block.micro-processor.name = Micro Processor +block.logic-processor.name = Logic Processor +block.logic-display.name = Logic Display +block.memory-cell.name = Memory Cell + team.blue.name = blue team.crux.name = red team.sharded.name = orange diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 624e2aad09..dfcd14ab60 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1314,7 +1314,7 @@ public class Blocks implements ContentList{ }}; coreNucleus = new CoreBlock("core-nucleus"){{ - requirements(Category.effect, with(Items.copper, 1000, Items.lead, 1000)); + requirements(Category.effect, with(Items.copper, 8000, Items.lead, 8000, Items.silicon, 5000, Items.thorium, 4000)); unitType = UnitTypes.gamma; health = 4000; diff --git a/core/src/mindustry/world/blocks/logic/MemoryBlock.java b/core/src/mindustry/world/blocks/logic/MemoryBlock.java index af89d8fa9d..a86900b114 100644 --- a/core/src/mindustry/world/blocks/logic/MemoryBlock.java +++ b/core/src/mindustry/world/blocks/logic/MemoryBlock.java @@ -10,6 +10,7 @@ public class MemoryBlock extends Block{ public MemoryBlock(String name){ super(name); destructible = true; + solid = true; } public class MemoryBuild extends Building{