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

#5742

Browse Source
This commit is contained in:
Anuken
2021-08-11 16:41:59 -04:00
parent c2720bbc33
commit 4fc18d35ce
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/mindustry/audio/SoundControl.java
View File

@@ -130,7 +130,12 @@ public class SoundControl{
Core.audio.soundBus.play(); Core.audio.soundBus.play();
setupFilters(); setupFilters();
}else{ }else{
Core.audio.soundBus.replay(); //stopping a single audio bus stops everything else, yay!
Core.audio.soundBus.stop();
//play music bus again, as it was stopped above
Core.audio.musicBus.play();
Core.audio.soundBus.play();
} }
} }

2
core/src/mindustry/content/Blocks.java
View File

@@ -2033,7 +2033,7 @@ public class Blocks implements ContentList{
payloadPropulsionTower = new PayloadMassDriver("payload-propulsion-tower"){{ payloadPropulsionTower = new PayloadMassDriver("payload-propulsion-tower"){{
requirements(Category.units, with(Items.thorium, 300, Items.silicon, 200, Items.plastanium, 200, Items.phaseFabric, 50)); requirements(Category.units, with(Items.thorium, 300, Items.silicon, 200, Items.plastanium, 200, Items.phaseFabric, 50));
size = 5; size = 5;
reloadTime = 140f; reloadTime = 130f;
chargeTime = 100f; chargeTime = 100f;
range = 1000f; range = 1000f;
maxPayloadSize = 3.5f; maxPayloadSize = 3.5f;

2
gradle.properties
View File

@@ -11,4 +11,4 @@ android.useAndroidX=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
http.socketTimeout=80000 http.socketTimeout=80000
http.connectionTimeout=80000 http.connectionTimeout=80000
archash=40c21b302ccc1e74f4c2a37f937c88acaec99254 archash=de1df819aae54e4023718a07dabf794da9f5a4de