diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 57403d110b..80bc7d2fb8 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1310,7 +1310,7 @@ public class Blocks implements ContentList{ itemCapacity = 9000; size = 4; - unitCapModifier = 16; + unitCapModifier = 14; }}; coreNucleus = new CoreBlock("core-nucleus"){{ @@ -1321,7 +1321,7 @@ public class Blocks implements ContentList{ itemCapacity = 13000; size = 5; - unitCapModifier = 24; + unitCapModifier = 20; }}; vault = new StorageBlock("vault"){{ @@ -1452,7 +1452,7 @@ public class Blocks implements ContentList{ recoilAmount = 2f; reloadTime = 90f; cooldown = 0.03f; - powerUse = 2.5f; + powerUse = 6f; shootShake = 2f; shootEffect = Fx.lancerLaserShoot; smokeEffect = Fx.none; diff --git a/core/src/mindustry/net/BeControl.java b/core/src/mindustry/net/BeControl.java index c7338319a5..e8679b7ffb 100644 --- a/core/src/mindustry/net/BeControl.java +++ b/core/src/mindustry/net/BeControl.java @@ -42,7 +42,7 @@ public class BeControl{ if(checkUpdates && !mobile){ checkUpdate(t -> {}); } - }, 1, updateInterval); + }, updateInterval, updateInterval); } } diff --git a/core/src/mindustry/world/blocks/defense/Door.java b/core/src/mindustry/world/blocks/defense/Door.java index c85c8247ea..7186152f36 100644 --- a/core/src/mindustry/world/blocks/defense/Door.java +++ b/core/src/mindustry/world/blocks/defense/Door.java @@ -84,7 +84,7 @@ public class Door extends Wall{ if(type == LAccess.enabled){ boolean shouldOpen = !Mathf.zero(p1); - if(net.client() || open == shouldOpen || (Units.anyEntities(tile) && !shouldOpen) || !origin().timer(timerToggle, 60f)){ + if(net.client() || open == shouldOpen || (Units.anyEntities(tile) && !shouldOpen) || !origin().timer(timerToggle, 80f)){ return; } @@ -134,7 +134,7 @@ public class Door extends Wall{ @Override public void tapped(){ - if((Units.anyEntities(tile) && open) || !origin().timer(timerToggle, 50f)){ + if((Units.anyEntities(tile) && open) || !origin().timer(timerToggle, 60f)){ return; } diff --git a/core/src/mindustry/world/blocks/logic/LogicBlock.java b/core/src/mindustry/world/blocks/logic/LogicBlock.java index 1f61097944..2848edbf27 100644 --- a/core/src/mindustry/world/blocks/logic/LogicBlock.java +++ b/core/src/mindustry/world/blocks/logic/LogicBlock.java @@ -165,7 +165,7 @@ public class LogicBlock extends Block{ } } - public class LogicBuild extends Building{ + public class LogicBuild extends Building implements Ranged{ /** logic "source code" as list of asm statements */ public String code = ""; public LExecutor executor = new LExecutor(); @@ -304,6 +304,11 @@ public class LogicBlock extends Block{ } } + @Override + public float range(){ + return range; + } + @Override public void updateTile(){ diff --git a/gradle.properties b/gradle.properties index 570fd9e2f9..30169cb6ce 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=71e03be946af9ec8e9f61fbc289e7c75acbfc184 +archash=0fafa5b7159c2a6c11f03ebd378a47736101b46e diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index 4756013b53..463ef9ad20 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -154,7 +154,7 @@ public class ServerControl implements ApplicationListener{ nextMapOverride = null; if(map != null){ Call.infoMessage((state.rules.pvp - ? "[yellow]The " + event.winner.name + " team is victorious![]" : "[scarlet]Game over![]") + ? "[accent]The " + event.winner.name + " team is victorious![]\n" : "[scarlet]Game over![]\n") + "\nNext selected map:[accent] " + map.name() + "[]" + (map.tags.containsKey("author") && !map.tags.get("author").trim().isEmpty() ? " by[accent] " + map.author() + "[white]" : "") + "." + "\nNew game begins in " + roundExtraTime + " seconds.");