diff --git a/core/assets/maps/aware.msav b/core/assets/maps/aware.msav index e074776712..3c2cf3e328 100644 Binary files a/core/assets/maps/aware.msav and b/core/assets/maps/aware.msav differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 157eab23c8..7074cb4976 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1698,7 +1698,7 @@ public class Blocks{ radar = new Radar("radar"){{ requirements(Category.effect, BuildVisibility.fogOnly, with(Items.silicon, 30, Items.graphite, 30)); outlineColor = Color.valueOf("4a4b53"); - fogRadius = 27; + fogRadius = 30; researchCost = with(Items.silicon, 50, Items.graphite, 50); consumePower(0.1f); @@ -2670,7 +2670,7 @@ public class Blocks{ //TODO should this be higher? buildCostMultiplier = 0.75f; - unitCapModifier = 30; + unitCapModifier = 20; researchCostMultiplier = 0.07f; }}; @@ -2685,7 +2685,7 @@ public class Blocks{ armor = 10f; incinerateNonBuildable = true; - unitCapModifier = 30; + unitCapModifier = 20; researchCostMultipliers.put(Items.silicon, 0.4f); researchCostMultiplier = 0.14f; }}; @@ -2702,7 +2702,7 @@ public class Blocks{ armor = 15f; incinerateNonBuildable = true; - unitCapModifier = 30; + unitCapModifier = 20; researchCostMultipliers.put(Items.silicon, 0.3f); researchCostMultiplier = 0.2f; }}; diff --git a/core/src/mindustry/content/Planets.java b/core/src/mindustry/content/Planets.java index 9c0e64f947..8eec30bb98 100644 --- a/core/src/mindustry/content/Planets.java +++ b/core/src/mindustry/content/Planets.java @@ -68,7 +68,7 @@ public class Planets{ r.attributes.set(Attribute.heat, 0.8f); r.showSpawns = true; r.fog = true; - r.staticFog = false; //TODO decide + r.staticFog = false; //TODO decide, is this a good idea? }; unlockedOnLand.add(Blocks.coreBastion); diff --git a/core/src/mindustry/world/blocks/ConstructBlock.java b/core/src/mindustry/world/blocks/ConstructBlock.java index 57b6f007a2..a5f220b9b8 100644 --- a/core/src/mindustry/world/blocks/ConstructBlock.java +++ b/core/src/mindustry/world/blocks/ConstructBlock.java @@ -55,10 +55,12 @@ public class ConstructBlock extends Block{ @Remote(called = Loc.server) public static void deconstructFinish(Tile tile, Block block, Unit builder){ Team team = tile.team(); - block.breakEffect.at(tile.drawx(), tile.drawy(), block.size, block.mapColor); + if(fogControl.isVisibleTile(player.team(), tile.x, tile.y)){ + block.breakEffect.at(tile.drawx(), tile.drawy(), block.size, block.mapColor); + if(shouldPlay()) block.breakSound.at(tile, block.breakPitchChange ? calcPitch(false) : 1f); + } Events.fire(new BlockBuildEndEvent(tile, builder, team, true, null)); tile.remove(); - if(shouldPlay()) block.breakSound.at(tile, block.breakPitchChange ? calcPitch(false) : 1f); } @Remote(called = Loc.server) @@ -96,8 +98,10 @@ public class ConstructBlock extends Block{ tile.build.playerPlaced(config); } - Fx.placeBlock.at(tile.drawx(), tile.drawy(), block.size); - if(shouldPlay()) block.placeSound.at(tile, block.placePitchChange ? calcPitch(true) : 1f); + if(fogControl.isVisibleTile(player.team(), tile.x, tile.y)){ + Fx.placeBlock.at(tile.drawx(), tile.drawy(), block.size); + if(shouldPlay()) block.placeSound.at(tile, block.placePitchChange ? calcPitch(true) : 1f); + } Events.fire(new BlockBuildEndEvent(tile, builder, team, false, config)); }