diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java index b4589573bb..df44910612 100644 --- a/core/src/io/anuke/mindustry/Vars.java +++ b/core/src/io/anuke/mindustry/Vars.java @@ -39,7 +39,6 @@ public class Vars{ //team of the enemy in waves public static final Team waveTeam = Team.red; - public static final float enemyCoreBuildRange = 400f; //discord group URL public static final String discordURL = "https://discord.gg/BKADYds"; public static final String releasesURL = "https://api.github.com/repos/Anuken/Mindustry/releases"; diff --git a/core/src/io/anuke/mindustry/game/GameMode.java b/core/src/io/anuke/mindustry/game/GameMode.java index 91d20c6303..5f7ccac4c7 100644 --- a/core/src/io/anuke/mindustry/game/GameMode.java +++ b/core/src/io/anuke/mindustry/game/GameMode.java @@ -20,9 +20,11 @@ public enum GameMode{ disableWaves = true; isPvp = true; hidden = true; + enemyCoreBuildRadius = 600f; }}; public boolean infiniteResources, disableWaveTimer, disableWaves, hidden, autoSpawn, isPvp; + public float enemyCoreBuildRadius = 400f; public String description(){ return Bundles.get("mode." + name() + ".description"); diff --git a/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java b/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java index 4194ec477f..9cddfc429c 100644 --- a/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java @@ -66,11 +66,11 @@ public class OverlayRenderer{ for(Team enemy : state.teams.enemiesOf(player.getTeam())){ for(Tile core : state.teams.get(enemy).cores){ float dst = Vector2.dst(player.x, player.y, core.drawx(), core.drawy()); - if(dst < enemyCoreBuildRange * 1.5f){ + if(dst < state.mode.enemyCoreBuildRadius * 1.5f){ Draw.color(Color.DARK_GRAY); - Lines.poly(core.drawx(), core.drawy() - 2, 200, enemyCoreBuildRange); + Lines.poly(core.drawx(), core.drawy() - 2, 200, state.mode.enemyCoreBuildRadius); Draw.color(Palette.accent, enemy.color, 0.5f + Mathf.absin(Timers.time(), 10f, 0.5f)); - Lines.poly(core.drawx(), core.drawy(), 200, enemyCoreBuildRange); + Lines.poly(core.drawx(), core.drawy(), 200, state.mode.enemyCoreBuildRadius); } } } diff --git a/core/src/io/anuke/mindustry/world/Build.java b/core/src/io/anuke/mindustry/world/Build.java index e9e5bf359f..727682165d 100644 --- a/core/src/io/anuke/mindustry/world/Build.java +++ b/core/src/io/anuke/mindustry/world/Build.java @@ -139,7 +139,7 @@ public class Build{ //check for enemy cores for(Team enemy : state.teams.enemiesOf(team)){ for(Tile core : state.teams.get(enemy).cores){ - if(Vector2.dst(x*tilesize + type.offset(), y*tilesize + type.offset(), core.drawx(), core.drawy()) < enemyCoreBuildRange + type.size*tilesize/2f){ + if(Vector2.dst(x*tilesize + type.offset(), y*tilesize + type.offset(), core.drawx(), core.drawy()) < state.mode.enemyCoreBuildRadius + type.size*tilesize/2f){ return false; } }