mirror of
https://github.com/Anuken/Mindustry.git
synced 2025-12-06 02:40:23 -08:00
Various new sounds
This commit is contained in:
parent
11773a5991
commit
cc693f97b6
10 changed files with 11 additions and 4 deletions
BIN
core/assets/sounds/beamPlasma.ogg
Normal file
BIN
core/assets/sounds/beamPlasma.ogg
Normal file
Binary file not shown.
BIN
core/assets/sounds/beamPlasmaFire.ogg
Normal file
BIN
core/assets/sounds/beamPlasmaFire.ogg
Normal file
Binary file not shown.
BIN
core/assets/sounds/beamPlasmaFireSmall.ogg
Normal file
BIN
core/assets/sounds/beamPlasmaFireSmall.ogg
Normal file
Binary file not shown.
BIN
core/assets/sounds/beamPlasmaSmall.ogg
Normal file
BIN
core/assets/sounds/beamPlasmaSmall.ogg
Normal file
Binary file not shown.
Binary file not shown.
BIN
core/assets/sounds/shock.ogg
Normal file
BIN
core/assets/sounds/shock.ogg
Normal file
Binary file not shown.
Binary file not shown.
|
|
@ -18,7 +18,8 @@ public class SoundPriority{
|
|||
2f,
|
||||
laserbig,
|
||||
beam,
|
||||
laserbeam
|
||||
laserbeam,
|
||||
beamPlasma
|
||||
);
|
||||
|
||||
//priority 1.5: big weapon sounds, not loops
|
||||
|
|
|
|||
|
|
@ -388,7 +388,7 @@ public class UnitTypes{
|
|||
|
||||
ejectEffect = Fx.none;
|
||||
recoil = 2.5f;
|
||||
shootSound = Sounds.spark;
|
||||
shootSound = Sounds.shock;
|
||||
|
||||
bullet = new LightningBulletType(){{
|
||||
lightningColor = hitColor = Pal.heal;
|
||||
|
|
@ -499,7 +499,8 @@ public class UnitTypes{
|
|||
reload = 155f;
|
||||
recoil = 0f;
|
||||
chargeSound = Sounds.lasercharge2;
|
||||
shootSound = Sounds.beam;
|
||||
shootSound = Sounds.beamPlasma;
|
||||
initialShootSound = Sounds.beamPlasmaFire;
|
||||
continuous = true;
|
||||
cooldownTime = 200f;
|
||||
|
||||
|
|
@ -2249,7 +2250,8 @@ public class UnitTypes{
|
|||
rotateSpeed = 3.5f;
|
||||
reload = 170f;
|
||||
recoil = 1f;
|
||||
shootSound = Sounds.beam;
|
||||
shootSound = Sounds.beamPlasmaSmall;
|
||||
initialShootSound = Sounds.beamPlasmaFireSmall;
|
||||
continuous = true;
|
||||
cooldownTime = reload;
|
||||
immunities.add(StatusEffects.burning);
|
||||
|
|
|
|||
|
|
@ -130,6 +130,8 @@ public class Weapon implements Cloneable{
|
|||
public Sound shootSound = Sounds.pew;
|
||||
/** volume of the shoot sound */
|
||||
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 */
|
||||
public Sound chargeSound = Sounds.none;
|
||||
/** sound played when there is nothing to shoot */
|
||||
|
|
@ -501,6 +503,8 @@ public class Weapon implements Cloneable{
|
|||
|
||||
if(!continuous){
|
||||
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));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue