Updated the core landing sound and added a launch sound (#9802)
* Added core launch sound and remade the land sound, * Updated the land.ogg to use Synth Pad 3 * Added saw * Updated
This commit is contained in:
BIN
core/assets/music/coreLaunch.ogg
Normal file
BIN
core/assets/music/coreLaunch.ogg
Normal file
Binary file not shown.
Binary file not shown.
@@ -2,6 +2,7 @@ package mindustry.core;
|
|||||||
|
|
||||||
import arc.*;
|
import arc.*;
|
||||||
import arc.assets.loaders.TextureLoader.*;
|
import arc.assets.loaders.TextureLoader.*;
|
||||||
|
import arc.audio.*;
|
||||||
import arc.files.*;
|
import arc.files.*;
|
||||||
import arc.graphics.*;
|
import arc.graphics.*;
|
||||||
import arc.graphics.Texture.*;
|
import arc.graphics.Texture.*;
|
||||||
@@ -554,6 +555,11 @@ public class Renderer implements ApplicationListener{
|
|||||||
landTime = landCore.landDuration();
|
landTime = landCore.landDuration();
|
||||||
launchCoreType = coreType;
|
launchCoreType = coreType;
|
||||||
|
|
||||||
|
Music music = landCore.launchMusic();
|
||||||
|
music.stop();
|
||||||
|
music.play();
|
||||||
|
music.setVolume(settings.getInt("musicvol") / 100f);
|
||||||
|
|
||||||
landCore.beginLaunch(coreType);
|
landCore.beginLaunch(coreType);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ public class CoreBlock extends StorageBlock{
|
|||||||
public UnitType unitType = UnitTypes.alpha;
|
public UnitType unitType = UnitTypes.alpha;
|
||||||
public float landDuration = 160f;
|
public float landDuration = 160f;
|
||||||
public Music landMusic = Musics.land;
|
public Music landMusic = Musics.land;
|
||||||
|
public Music launchMusic = Musics.coreLaunch;
|
||||||
public Effect launchEffect = Fx.launch;
|
public Effect launchEffect = Fx.launch;
|
||||||
|
|
||||||
public Interp landZoomInterp = Interp.pow3;
|
public Interp landZoomInterp = Interp.pow3;
|
||||||
@@ -333,6 +334,10 @@ public class CoreBlock extends StorageBlock{
|
|||||||
return landMusic;
|
return landMusic;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Music launchMusic(){
|
||||||
|
return launchMusic;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void draw(){
|
public void draw(){
|
||||||
//draw thrusters when just landed
|
//draw thrusters when just landed
|
||||||
|
|||||||
Reference in New Issue
Block a user