From dd5389c738bcc1cdb6694670552bda3fdf1589ef Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 14 Jul 2021 17:22:21 -0400 Subject: [PATCH] New sound for rock/plant breaking --- core/assets/sounds/plantBreak.ogg | Bin 0 -> 8270 bytes core/assets/sounds/rockBreak.ogg | Bin 0 -> 16627 bytes core/src/mindustry/content/Blocks.java | 1 + .../mindustry/entities/comp/BuildingComp.java | 2 +- core/src/mindustry/world/Block.java | 6 ++++-- .../mindustry/world/blocks/ConstructBlock.java | 4 ++-- .../world/blocks/environment/Prop.java | 3 +++ 7 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 core/assets/sounds/plantBreak.ogg create mode 100644 core/assets/sounds/rockBreak.ogg diff --git a/core/assets/sounds/plantBreak.ogg b/core/assets/sounds/plantBreak.ogg new file mode 100644 index 0000000000000000000000000000000000000000..08d911b3e7c45509c5632405d675d71502087fa6 GIT binary patch literal 8270 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 ZRM?r|>?xpa39C6JpjO4mf?feo{{s`ulAr(p literal 0 HcmV?d00001 diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index fcadf439f9..b2971a8bc1 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -368,6 +368,7 @@ public class Blocks implements ContentList{ sporeCluster = new Prop("spore-cluster"){{ variants = 3; + breakSound = Sounds.plantBreak; }}; boulder = new Prop("boulder"){{ diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index 24d4e5cb3e..3ccc414500 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -1442,7 +1442,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, @Override public void killed(){ Events.fire(new BlockDestroyEvent(tile)); - block.breakSound.at(tile); + block.destroySound.at(tile); onDestroyed(); tile.remove(); remove(); diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index 2fccf0130b..d7a52caf4b 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -190,8 +190,10 @@ public class Block extends UnlockableContent{ public int outlinedIcon = -1; /** Whether this block has a shadow under it. */ public boolean hasShadow = true; - /** Sounds made when this block breaks.*/ - public Sound breakSound = Sounds.boom; + /** Sounds made when this block is destroyed.*/ + public Sound destroySound = Sounds.boom; + /** Sound made when this block is deconstructed. */ + public Sound breakSound = Sounds.breaks; /** How reflective this block is. */ public float albedo = 0f; /** Environmental passive light color. */ diff --git a/core/src/mindustry/world/blocks/ConstructBlock.java b/core/src/mindustry/world/blocks/ConstructBlock.java index 4c2fc98b1c..a3a66b1280 100644 --- a/core/src/mindustry/world/blocks/ConstructBlock.java +++ b/core/src/mindustry/world/blocks/ConstructBlock.java @@ -47,7 +47,7 @@ public class ConstructBlock extends Block{ /** Returns a ConstructBlock by size. */ public static ConstructBlock get(int size){ - if(size > maxBlockSize) throw new IllegalArgumentException("No. Don't place ConstructBlock of size greater than " + maxBlockSize); + if(size > maxBlockSize) throw new IllegalArgumentException("No. Don't place ConstructBlocks of size greater than " + maxBlockSize); return consBlocks[size - 1]; } @@ -57,7 +57,7 @@ public class ConstructBlock extends Block{ block.breakEffect.at(tile.drawx(), tile.drawy(), block.size, block.mapColor); Events.fire(new BlockBuildEndEvent(tile, builder, team, true, null)); tile.remove(); - if(shouldPlay()) Sounds.breaks.at(tile, calcPitch(false)); + if(shouldPlay()) block.breakSound.at(tile, calcPitch(false)); } @Remote(called = Loc.server) diff --git a/core/src/mindustry/world/blocks/environment/Prop.java b/core/src/mindustry/world/blocks/environment/Prop.java index 45da9aae88..0e7807acdd 100644 --- a/core/src/mindustry/world/blocks/environment/Prop.java +++ b/core/src/mindustry/world/blocks/environment/Prop.java @@ -4,15 +4,18 @@ import arc.*; import arc.graphics.g2d.*; import arc.math.*; import mindustry.content.*; +import mindustry.gen.*; import mindustry.world.*; public class Prop extends Block{ + public Prop(String name){ super(name); breakable = true; alwaysReplace = true; instantDeconstruct = true; breakEffect = Fx.breakProp; + breakSound = Sounds.rockBreak; } @Override