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

it launches

Browse Source
This commit is contained in:
Anuken
2020-02-05 22:08:57 -05:00
parent 65857d77c4
commit 8172e69f8c
13 changed files with 127 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
desktop/src/mindustry/desktop/DesktopLauncher.java
View File

@@ -17,6 +17,7 @@ import mindustry.core.GameState.*;
import mindustry.core.*;
import mindustry.desktop.steam.*;
import mindustry.game.EventType.*;
import mindustry.gen.*;
import mindustry.net.*;
import mindustry.net.Net.*;
import mindustry.type.*;
@@ -136,9 +137,9 @@ public class DesktopLauncher extends ClientLauncher{
boolean[] isShutdown = {false};
Events.on(ClientLoadEvent.class, event -> {
player.name = SVars.net.friends.getPersonaName();
player.name(SVars.net.friends.getPersonaName());
Core.settings.defaults("name", SVars.net.friends.getPersonaName());
Core.settings.put("name", player.name);
Core.settings.put("name", player.name());
Core.settings.save();
//update callbacks
Core.app.addListener(new ApplicationListener(){
@@ -260,8 +261,8 @@ public class DesktopLauncher extends ClientLauncher{
gameMapWithWave += " | Wave " + state.wave;
}
gameMode = state.rules.pvp ? "PvP" : state.rules.attackMode ? "Attack" : "Survival";
if(net.active() && playerGroup.size() > 1){
gamePlayersSuffix = " | " + playerGroup.size() + " Players";
if(net.active() && Groups.player.size() > 1){
gamePlayersSuffix = " | " + Groups.player.size() + " Players";
}
}else{
if(ui.editor != null && ui.editor.isShown()){

2
desktop/src/mindustry/desktop/steam/SNet.java
View File

@@ -348,7 +348,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
if(result == SteamResult.OK){
currentLobby = steamID;
smat.setLobbyData(steamID, "name", player.name);
smat.setLobbyData(steamID, "name", player.name());
smat.setLobbyData(steamID, "mapname", world.getMap() == null ? "Unknown" : state.rules.zone == null ? world.getMap().name() : state.rules.zone.localizedName);
smat.setLobbyData(steamID, "version", Version.build + "");
smat.setLobbyData(steamID, "versionType", Version.type);

13
desktop/src/mindustry/desktop/steam/SStats.java
View File

@@ -9,6 +9,7 @@ import mindustry.content.*;
import mindustry.entities.units.*;
import mindustry.game.EventType.*;
import mindustry.game.Stats.*;
import mindustry.gen.*;
import mindustry.type.*;
import static mindustry.Vars.*;
@@ -53,18 +54,18 @@ public class SStats implements SteamUserStatsCallback{
private void checkUpdate(){
if(campaign()){
SStat.maxUnitActive.max(unitGroup.count(t -> t.team() == player.team()));
SStat.maxUnitActive.max(Groups.unit.count(t -> t.team() == player.team()));
if(unitGroup.count(u -> u.getType() == UnitTypes.phantom && u.team() == player.team()) >= 10){
if(Groups.unit.count(u -> u.type() == UnitTypes.phantom && u.team() == player.team()) >= 10){
active10Phantoms.complete();
}
if(unitGroup.count(u -> u.getType() == UnitTypes.crawler && u.team() == player.team()) >= 50){
if(Groups.unit.count(u -> u.type() == UnitTypes.crawler && u.team() == player.team()) >= 50){
active50Crawlers.complete();
}
for(Tilec entity : player.team().cores()){
if(!content.items().contains(i -> i.type == ItemType.material && entity.items().get(i) < entity.block.itemCapacity)){
if(!content.items().contains(i -> i.type == ItemType.material && entity.items().get(i) < entity.block().itemCapacity)){
fillCoreAllCampaign.complete();
break;
}
@@ -92,7 +93,7 @@ public class SStats implements SteamUserStatsCallback{
});
Events.on(Trigger.newGame, () -> Core.app.post(() -> {
if(campaign() && player.closestCore() != null && player.closestCore().items.total() >= 10 * 1000){
if(campaign() && player.closestCore() != null && player.closestCore().items().total() >= 10 * 1000){
drop10kitems.complete();
}
}));
@@ -216,7 +217,7 @@ public class SStats implements SteamUserStatsCallback{
Events.on(PlayerJoin.class, e -> {
if(Vars.net.server()){
SStat.maxPlayersServer.max(Vars.playerGroup.size());
SStat.maxPlayersServer.max(Groups.player.size());
}
});