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

Misc

Browse Source
This commit is contained in:
Anuken
2022-04-02 17:33:35 -04:00
parent eb9fa31d6e
commit 91f19a5c81
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,7 @@ import static mindustry.Vars.*;
/** Controls playback of multiple audio tracks.*/ /** Controls playback of multiple audio tracks.*/
public class SoundControl{ public class SoundControl{
protected static final float finTime = 120f, foutTime = 120f, musicInterval = 3f * Time.toMinutes, musicChance = 0.6f, musicWaveChance = 0.46f; public float finTime = 120f, foutTime = 120f, musicInterval = 3f * Time.toMinutes, musicChance = 0.6f, musicWaveChance = 0.46f;
/** normal, ambient music, plays at any time */ /** normal, ambient music, plays at any time */
public Seq<Music> ambientMusic = Seq.with(); public Seq<Music> ambientMusic = Seq.with();

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

@@ -3166,7 +3166,7 @@ public class UnitTypes{
shoot = new ShootHelix(); shoot = new ShootHelix();
//TODO cooler + balancing //TODO cooler + balancing
bullet = new BasicBulletType(5f, 20){{ bullet = new BasicBulletType(5f, 25){{
width = 7f; width = 7f;
height = 12f; height = 12f;
lifetime = 25f; lifetime = 25f;

2
core/src/mindustry/net/ArcNetProvider.java
View File

@@ -24,7 +24,7 @@ import static mindustry.Vars.*;
public class ArcNetProvider implements NetProvider{ public class ArcNetProvider implements NetProvider{
final Client client; final Client client;
final Prov<DatagramPacket> packetSupplier = () -> new DatagramPacket(new byte[512], 512); final Prov<DatagramPacket> packetSupplier = () -> new DatagramPacket(new byte[512], 512);
final ExecutorService executor = Threads.executor(Math.max(Runtime.getRuntime().availableProcessors(), 6)); final ExecutorService executor = Threads.executor(1);
final Server server; final Server server;
final CopyOnWriteArrayList<ArcConnection> connections = new CopyOnWriteArrayList<>(); final CopyOnWriteArrayList<ArcConnection> connections = new CopyOnWriteArrayList<>();

2
core/src/mindustry/ui/dialogs/PlanetDialog.java
View File

@@ -849,7 +849,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
//export //export
displayItems(c, sector.getProductionScale(), sector.info.export, "@sectors.export", t -> { displayItems(c, sector.getProductionScale(), sector.info.export, "@sectors.export", t -> {
if(sector.info.destination != null){ if(sector.info.destination != null && sector.info.destination.hasBase()){
String ic = sector.info.destination.iconChar(); String ic = sector.info.destination.iconChar();
t.add(Iconc.rightOpen + " " + (ic == null || ic.isEmpty() ? "" : ic + " ") + sector.info.destination.name()).padLeft(10f).row(); t.add(Iconc.rightOpen + " " + (ic == null || ic.isEmpty() ? "" : ic + " ") + sector.info.destination.name()).padLeft(10f).row();
} }