diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index d885c1cc8e..92c3c960a2 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -540,3 +540,4 @@ 63163=carbide-wall|block-carbide-wall-ui 63162=carbide-wall-large|block-carbide-wall-large-ui 63161=prime-control-core|block-prime-control-core-ui +63160=ore-wall-thorium|block-ore-wall-thorium-ui diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 73a65b4414..c60d11f243 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -2471,7 +2471,7 @@ public class Blocks{ requirements(Category.production, with(Items.graphite, 20, Items.beryllium, 30)); consumes.power(0.15f); drillTime = 160f; - tier = 4; + tier = 3; size = 2; range = 4; researchCostMultiplier = 0.18f; @@ -2485,7 +2485,7 @@ public class Blocks{ requirements(Category.production, with(Items.silicon, 100, Items.oxide, 30, Items.beryllium, 100, Items.tungsten, 70)); consumes.power(0.8f); drillTime = 120f; - tier = 5; + tier = 4; size = 3; range = 6; laserWidth = 0.7f; @@ -3719,7 +3719,7 @@ public class Blocks{ consumes.power(2f); size = 3; //TODO expand this list - filter = Seq.with(Blocks.primeControlCore, Blocks.tungstenWallLarge, Blocks.berylliumWallLarge, Blocks.reinforcedLiquidContainer); + filter = Seq.with(Blocks.primeControlCore, Blocks.tungstenWallLarge, Blocks.berylliumWallLarge, Blocks.reinforcedLiquidContainer, Blocks.beamNode); }}; //yes this block is pretty much useless diff --git a/core/src/mindustry/content/Items.java b/core/src/mindustry/content/Items.java index c0a27302f9..7a638ac744 100644 --- a/core/src/mindustry/content/Items.java +++ b/core/src/mindustry/content/Items.java @@ -100,7 +100,7 @@ public class Items{ }}; beryllium = new Item("beryllium", Color.valueOf("3a8f64")){{ - hardness = 4; + hardness = 3; cost = 1.2f; healthScaling = 0.6f; }}; diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 999926a7e9..7bb17788c4 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -256,7 +256,7 @@ public class UnitTypes{ ejectEffect = Fx.casing4; shootSound = Sounds.bang; - bullet = new BasicBulletType(13f, 70){{ + bullet = new BasicBulletType(13f, 80){{ pierce = true; pierceCap = 10; width = 14f; @@ -266,14 +266,14 @@ public class UnitTypes{ fragVelocityMin = 0.4f; hitEffect = Fx.blastExplosion; - splashDamage = 16f; + splashDamage = 18f; splashDamageRadius = 13f; fragBullets = 3; fragLifeMin = 0f; fragCone = 30f; - fragBullet = new BasicBulletType(9f, 18){{ + fragBullet = new BasicBulletType(9f, 20){{ width = 10f; height = 10f; pierce = true; diff --git a/core/src/mindustry/game/Teams.java b/core/src/mindustry/game/Teams.java index a7a4730192..af489f6935 100644 --- a/core/src/mindustry/game/Teams.java +++ b/core/src/mindustry/game/Teams.java @@ -72,8 +72,7 @@ public class Teams{ /** Returns team data by type. */ public TeamData get(Team team){ - if(map[team.id] == null) map[team.id] = new TeamData(team); - return map[team.id]; + return map[team.id] == null ? (map[team.id] = new TeamData(team)) : map[team.id]; } public Seq playerCores(){ diff --git a/core/src/mindustry/world/blocks/logic/MemoryBlock.java b/core/src/mindustry/world/blocks/logic/MemoryBlock.java index 315a3be803..a97523b4ac 100644 --- a/core/src/mindustry/world/blocks/logic/MemoryBlock.java +++ b/core/src/mindustry/world/blocks/logic/MemoryBlock.java @@ -5,6 +5,8 @@ import mindustry.gen.*; import mindustry.world.*; import mindustry.world.meta.*; +import static mindustry.Vars.*; + public class MemoryBlock extends Block{ public int memoryCapacity = 32; @@ -24,6 +26,15 @@ public class MemoryBlock extends Block{ stats.add(Stat.memoryCapacity, memoryCapacity, StatUnit.none); } + public boolean accessible(){ + return !privileged || state.rules.editor; + } + + @Override + public boolean canBreak(Tile tile){ + return accessible(); + } + public class MemoryBuild extends Building{ public double[] memory = new double[memoryCapacity]; @@ -40,7 +51,7 @@ public class MemoryBlock extends Block{ @Override public boolean displayable(){ - return !privileged; + return accessible(); } @Override