diff --git a/core/assets/maps/origin.msav b/core/assets/maps/origin.msav index 3cc9996e02..7b80a8da9b 100644 Binary files a/core/assets/maps/origin.msav and b/core/assets/maps/origin.msav differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index e43e6d41f4..2403744bd2 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -4398,8 +4398,6 @@ public class Blocks{ lustre = new ContinuousTurret("lustre"){{ requirements(Category.turret, with(Items.silicon, 250, Items.graphite, 200, Items.oxide, 50, Items.carbide, 90)); - range = 140f; - shootType = new PointLaserBulletType(){{ damage = 200f; buildingDamageMultiplier = 0.3f; @@ -4595,7 +4593,7 @@ public class Blocks{ recoil = 0.5f; - fogRadiusMultiuplier = 0.45f; + fogRadiusMultiuplier = 0.5f; coolantMultiplier = 6f; shootSound = Sounds.missileLaunch; diff --git a/core/src/mindustry/net/Administration.java b/core/src/mindustry/net/Administration.java index 60c7864667..c3dd335ea4 100644 --- a/core/src/mindustry/net/Administration.java +++ b/core/src/mindustry/net/Administration.java @@ -486,7 +486,7 @@ public class Administration{ interactRateKick = new Config("interactRateKick", "How many times a player must interact inside the window to get kicked.", 60), messageRateLimit = new Config("messageRateLimit", "Message rate limit in seconds. 0 to disable.", 0), messageSpamKick = new Config("messageSpamKick", "How many times a player must send a message before the cooldown to get kicked. 0 to disable.", 3), - packetSpamLimit = new Config("packetSpamLimit", "Limit for packet count sent within 3sec that will lead to a blacklist + kick.", 270), + packetSpamLimit = new Config("packetSpamLimit", "Limit for packet count sent within 3sec that will lead to a blacklist + kick.", 300), socketInput = new Config("socketInput", "Allows a local application to control this server through a local TCP socket.", false, "socket", () -> Events.fire(Trigger.socketConfigChanged)), socketInputPort = new Config("socketInputPort", "The port for socket input.", 6859, () -> Events.fire(Trigger.socketConfigChanged)), socketInputAddress = new Config("socketInputAddress", "The bind address for socket input.", "localhost", () -> Events.fire(Trigger.socketConfigChanged)), diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index 7357627197..32c3a735db 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -501,6 +501,10 @@ public class Block extends UnlockableContent implements Senseable{ return update || destructible; } + public boolean checkForceDark(Tile tile){ + return forceDark; + } + @Override public void setStats(){ super.setStats(); diff --git a/core/src/mindustry/world/Tile.java b/core/src/mindustry/world/Tile.java index 85f20acf1b..251e2011d3 100644 --- a/core/src/mindustry/world/Tile.java +++ b/core/src/mindustry/world/Tile.java @@ -164,7 +164,7 @@ public class Tile implements Position, QuadTreeObject, Displayable{ } public boolean isDarkened(){ - return block.solid && ((!block.synthetic() && block.fillsTile) || block.forceDark); + return block.solid && ((!block.synthetic() && block.fillsTile) || block.checkForceDark(this)); } public Floor floor(){ diff --git a/core/src/mindustry/world/blocks/logic/LogicBlock.java b/core/src/mindustry/world/blocks/logic/LogicBlock.java index 63d458b9aa..d93c7e0904 100644 --- a/core/src/mindustry/world/blocks/logic/LogicBlock.java +++ b/core/src/mindustry/world/blocks/logic/LogicBlock.java @@ -82,6 +82,11 @@ public class LogicBlock extends Block{ }); } + @Override + public boolean checkForceDark(Tile tile){ + return !accessible(); + } + public boolean accessible(){ return !privileged || state.rules.editor || state.playtestingMap != null; } diff --git a/core/src/mindustry/world/blocks/logic/MessageBlock.java b/core/src/mindustry/world/blocks/logic/MessageBlock.java index 344f13e4b0..106f60b3eb 100644 --- a/core/src/mindustry/world/blocks/logic/MessageBlock.java +++ b/core/src/mindustry/world/blocks/logic/MessageBlock.java @@ -180,11 +180,6 @@ public class MessageBlock extends Block{ return !privileged; } - @Override - public boolean displayable(){ - return accessible(); - } - @Override public void handleString(Object value){ message.setLength(0);