Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Customizable Block Place Sound (#6043)

Browse Source
This commit is contained in:
Matthew Peng
2021-09-24 21:28:20 -04:00
committed by GitHub
parent dac17aa2b7
commit 50cc340b20
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/world/Block.java
+8 -2
View File
@@ -202,10 +202,16 @@ public class Block extends UnlockableContent{
public int outlinedIcon = -1; public int outlinedIcon = -1;
/** Whether this block has a shadow under it. */ /** Whether this block has a shadow under it. */
public boolean hasShadow = true; public boolean hasShadow = true;
/** Sounds made when this block is destroyed.*/ /** Should the sound made when this block is built change in pitch. */
public Sound destroySound = Sounds.boom; public boolean placePitchChange = true;
/** Should the sound made when this block is deconstructed change in pitch. */
public boolean breakPitchChange = true;
/** Sound made when this block is built. */
public Sound placeSound = Sounds.place;
/** Sound made when this block is deconstructed. */ /** Sound made when this block is deconstructed. */
public Sound breakSound = Sounds.breaks; public Sound breakSound = Sounds.breaks;
/** Sounds made when this block is destroyed.*/
public Sound destroySound = Sounds.boom;
/** How reflective this block is. */ /** How reflective this block is. */
public float albedo = 0f; public float albedo = 0f;
/** Environmental passive light color. */ /** Environmental passive light color. */
core/src/mindustry/world/blocks/ConstructBlock.java
+2 -2
View File
@@ -58,7 +58,7 @@ public class ConstructBlock extends Block{
block.breakEffect.at(tile.drawx(), tile.drawy(), block.size, block.mapColor); block.breakEffect.at(tile.drawx(), tile.drawy(), block.size, block.mapColor);
Events.fire(new BlockBuildEndEvent(tile, builder, team, true, null)); Events.fire(new BlockBuildEndEvent(tile, builder, team, true, null));
tile.remove(); tile.remove();
if(shouldPlay()) block.breakSound.at(tile, calcPitch(false)); if(shouldPlay()) block.breakSound.at(tile, block.breakPitchChange ? calcPitch(false) : 1f);
} }
@Remote(called = Loc.server) @Remote(called = Loc.server)
@@ -97,7 +97,7 @@ public class ConstructBlock extends Block{
} }
Fx.placeBlock.at(tile.drawx(), tile.drawy(), block.size); Fx.placeBlock.at(tile.drawx(), tile.drawy(), block.size);
if(shouldPlay()) Sounds.place.at(tile, calcPitch(true)); if(shouldPlay()) block.placeSound.at(tile, block.placePitchChange ? calcPitch(true) : 1f);
Events.fire(new BlockBuildEndEvent(tile, builder, team, false, config)); Events.fire(new BlockBuildEndEvent(tile, builder, team, false, config));
} }