diff --git a/core/assets/sounds/titanExplosion.ogg b/core/assets/sounds/titanExplosion.ogg new file mode 100644 index 0000000000..57f0f8ca71 Binary files /dev/null and b/core/assets/sounds/titanExplosion.ogg differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 6e27d67c46..e746113041 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -2754,6 +2754,8 @@ public class Blocks{ output = Items.sand; fogRadius = 2; researchCost = with(Items.beryllium, 100, Items.graphite, 40); + ambientSound = Sounds.drill; + ambientSoundVolume = 0.04f; }}; plasmaBore = new BeamDrill("plasma-bore"){{ @@ -4086,6 +4088,7 @@ public class Blocks{ backColor = hitColor = trailColor = Color.valueOf("ea8878").lerp(Pal.redLight, 0.5f); frontColor = Color.white; ammoMultiplier = 1f; + hitSound = Sounds.titanExplosion; status = StatusEffects.blasted; @@ -4106,6 +4109,7 @@ public class Blocks{ }} ); + shootSound = Sounds.mediumCannon; ammoPerShot = 4; maxAmmo = ammoPerShot * 3; targetAir = false; @@ -4116,7 +4120,6 @@ public class Blocks{ rotateSpeed = 1.4f; minWarmup = 0.85f; shootWarmupSpeed = 0.07f; - shootSound = Sounds.artillery; coolant = consume(new ConsumeLiquid(Liquids.water, 30f / 60f)); coolantMultiplier = 1.5f; diff --git a/gradle.properties b/gradle.properties index ea953596e5..db67238f1c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,4 +25,4 @@ org.gradle.caching=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=d3b6ab563b +archash=eae3c2dc59