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

Progress on new SFX (WIP)

Browse Source 
Pitch is broken in the sound engine - this has already been fixed, but I haven't updated the natives
This commit is contained in:
Anuken
2025-11-07 15:53:13 -05:00
parent 5397d8426c
commit 3f2aba4123
23 changed files with 86 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/mindustry/world/blocks/distribution/MassDriver.java
View File

@@ -36,7 +36,9 @@ public class MassDriver extends Block{
public Effect shootEffect = Fx.shootBig2;
public Effect smokeEffect = Fx.shootBigSmoke2;
public Effect receiveEffect = Fx.mineBig;
public Sound shootSound = Sounds.shootBig;
public Sound shootSound = Sounds.massdriver;
public Sound receiveSound = Sounds.massdriverReceive;
public float shootSoundVolume = 0.5f;
public float shake = 3f;
public @Load("@-base") TextureRegion baseRegion;
@@ -306,7 +308,7 @@ public class MassDriver extends Block{
Effect.shake(shake, shake, this);
shootSound.at(tile, Mathf.random(0.9f, 1.1f));
shootSound.at(x, y, 1f + Mathf.range(0.2f), shootSoundVolume);
}
public void handlePayload(Bullet bullet, DriverBulletData data){
@@ -326,6 +328,7 @@ public class MassDriver extends Block{
Effect.shake(shake, shake, this);
receiveEffect.at(bullet);
receiveSound.at(x, y, 1f + Mathf.range(0.2f), shootSoundVolume);
reloadCounter = 1f;
bullet.remove();

7
core/src/mindustry/world/blocks/payloads/PayloadMassDriver.java
View File

@@ -32,7 +32,9 @@ public class PayloadMassDriver extends PayloadBlock{
public Effect shootEffect = Fx.shootBig2;
public Effect smokeEffect = Fx.shootPayloadDriver;
public Effect receiveEffect = Fx.payloadReceive;
public Sound shootSound = Sounds.shootBig;
public Sound shootSound = Sounds.massdriver;
public Sound receiveSound = Sounds.massdriverReceive;
public float shootSoundVolume = 0.7f;
public float shake = 3f;
public Effect transferEffect = new Effect(11f, 600f, e -> {
@@ -176,6 +178,7 @@ public class PayloadMassDriver extends PayloadBlock{
receiveEffect.at(x - cx/2f, y - cy/2f, turretRotation);
reloadCounter = 1f;
Effect.shake(shake, shake, this);
receiveSound.at(x, y, 1f + Mathf.range(0.2f), shootSoundVolume);
}
charging = false;
@@ -294,7 +297,7 @@ public class PayloadMassDriver extends PayloadBlock{
smokeEffect.at(x, y, turretRotation);
Effect.shake(shake, shake, this);
shootSound.at(this, Mathf.random(0.9f, 1.1f));
shootSound.at(x, y, Mathf.random(0.9f, 1.1f), shootSoundVolume);
transferEffect.at(x + cx, y + cy, turretRotation, new PayloadMassDriverData(x + cx, y + cy, other.x - cx, other.y - cy, payload));
Payload pay = payload;
other.recPayload = payload;