mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-28 07:22:21 -08:00
Code Issues Projects Releases Wiki Activity

More minor fixes

Browse source
This commit is contained in:
Anuken 2022-03-02 23:06:13 -05:00
parent bd320e39ed
commit f1a5b720b7
4 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
core/assets/maps/aware.msav
View file

Binary file not shown.

8
core/src/mindustry/content/Blocks.java
View file

@ -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;
}};

2
core/src/mindustry/content/Planets.java
View file

@ -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);

12
core/src/mindustry/world/blocks/ConstructBlock.java
View file

@ -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));
}