mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-12-15 15:20:57 -08:00
Code Issues Projects Releases Wiki Activity

Various new sounds

Browse source
This commit is contained in:
Anuken 2025-11-15 15:16:28 -05:00
parent 11773a5991
commit cc693f97b6
10 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
core/assets/sounds/beamPlasma.ogg Normal file
View file

Binary file not shown.

BIN
core/assets/sounds/beamPlasmaFire.ogg Normal file
View file

Binary file not shown.

BIN
core/assets/sounds/beamPlasmaFireSmall.ogg Normal file
View file

Binary file not shown.

BIN
core/assets/sounds/beamPlasmaSmall.ogg Normal file
View file

Binary file not shown.

BIN
core/assets/sounds/lasercharge2.ogg
View file

Binary file not shown.

BIN
core/assets/sounds/shock.ogg Normal file
View file

Binary file not shown.

BIN
core/assets/sounds/spark.ogg
View file

Binary file not shown.

3
core/src/mindustry/audio/SoundPriority.java
View file

@ -18,7 +18,8 @@ public class SoundPriority{
2f, 2f,
laserbig, laserbig,
beam, beam,
laserbeam laserbeam,
beamPlasma
); );
//priority 1.5: big weapon sounds, not loops //priority 1.5: big weapon sounds, not loops

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

@ -388,7 +388,7 @@ public class UnitTypes{
ejectEffect = Fx.none; ejectEffect = Fx.none;
recoil = 2.5f; recoil = 2.5f;
shootSound = Sounds.spark; shootSound = Sounds.shock;
bullet = new LightningBulletType(){{ bullet = new LightningBulletType(){{
lightningColor = hitColor = Pal.heal; lightningColor = hitColor = Pal.heal;
@ -499,7 +499,8 @@ public class UnitTypes{
reload = 155f; reload = 155f;
recoil = 0f; recoil = 0f;
chargeSound = Sounds.lasercharge2; chargeSound = Sounds.lasercharge2;
shootSound = Sounds.beam; shootSound = Sounds.beamPlasma;
initialShootSound = Sounds.beamPlasmaFire;
continuous = true; continuous = true;
cooldownTime = 200f; cooldownTime = 200f;
@ -2249,7 +2250,8 @@ public class UnitTypes{
rotateSpeed = 3.5f; rotateSpeed = 3.5f;
reload = 170f; reload = 170f;
recoil = 1f; recoil = 1f;
shootSound = Sounds.beam; shootSound = Sounds.beamPlasmaSmall;
initialShootSound = Sounds.beamPlasmaFireSmall;
continuous = true; continuous = true;
cooldownTime = reload; cooldownTime = reload;
immunities.add(StatusEffects.burning); immunities.add(StatusEffects.burning);

4
core/src/mindustry/type/Weapon.java
View file

@ -130,6 +130,8 @@ public class Weapon implements Cloneable{
public Sound shootSound = Sounds.pew; public Sound shootSound = Sounds.pew;
/** volume of the shoot sound */ /** volume of the shoot sound */
public float shootSoundVolume = 1f; public float shootSoundVolume = 1f;
/** sound used when this weapon first fires; for continuous weapons only */
public Sound initialShootSound = Sounds.none;
/** sound used for weapons that have a delay */ /** sound used for weapons that have a delay */
public Sound chargeSound = Sounds.none; public Sound chargeSound = Sounds.none;
/** sound played when there is nothing to shoot */ /** sound played when there is nothing to shoot */
@ -501,6 +503,8 @@ public class Weapon implements Cloneable{
if(!continuous){ if(!continuous){
shootSound.at(bulletX, bulletY, Mathf.random(soundPitchMin, soundPitchMax), shootSoundVolume); shootSound.at(bulletX, bulletY, Mathf.random(soundPitchMin, soundPitchMax), shootSoundVolume);
}else{
initialShootSound.at(bulletX, bulletY, Mathf.random(soundPitchMin, soundPitchMax), shootSoundVolume);
} }
ejectEffect.at(mountX, mountY, angle * Mathf.sign(this.x)); ejectEffect.at(mountX, mountY, angle * Mathf.sign(this.x));