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

Minor achievement cleanup

Browse Source
This commit is contained in:
Anuken
2020-11-03 17:19:00 -05:00
parent dc3e376be5
commit 775327ebcb
7 changed files with 38 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
desktop/src/mindustry/desktop/steam/SAchievement.java
View File

@@ -31,32 +31,28 @@ public enum SAchievement{
defeatBoss(SStat.bossesDefeated, 1),
//TODO
captureAllSectors,
//configAllZones,
//TODO
capture10Sectors,
//TODO
drop10kitems,
powerupImpactReactor,
obtainThorium,
obtainTitanium,
suicideBomb,
buildDaggerFactory,
buildGroundFactory,
issueAttackCommand,
active100Units(SStat.maxUnitActive, 100),
active10Phantoms,
active50Crawlers,
build1000Units,
//TODO
buildAllUnits,
//TODO
activeAllT5,
//TODO
//earnSRank,
//earnSSRank,
dieExclusion,
drown,
fillCoreAllCampaign,
hostServer10(SStat.maxPlayersServer, 10),
buildMeltdownSpectreForeshadow,
launchItemPad,
//skipLaunching2Death,
chainRouters,
//TODO
becomeRouter,

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

@@ -8,7 +8,6 @@ import mindustry.content.*;
import mindustry.entities.units.*;
import mindustry.game.EventType.*;
import mindustry.gen.*;
import mindustry.type.*;
import static mindustry.Vars.*;
import static mindustry.desktop.steam.SAchievement.*;
@@ -59,8 +58,9 @@ public class SStats implements SteamUserStatsCallback{
// active10Phantoms.complete();
//}
//TODO
if(Groups.unit.count(u -> u.type == UnitTypes.crawler && u.team() == player.team()) >= 50){
active50Crawlers.complete();
// active50Crawlers.complete();
}
for(Building entity : player.team().cores()){
@@ -75,23 +75,16 @@ public class SStats implements SteamUserStatsCallback{
private void registerEvents(){
Events.on(UnitDestroyEvent.class, e -> {
if(ncustom()){
if(e.unit.team() != Vars.player.team()){
if(e.unit.team != Vars.player.team()){
SStat.unitsDestroyed.add();
if(e.unit instanceof Unit && ((Unit)e.unit).isBoss()){
if(e.unit.isBoss()){
SStat.bossesDefeated.add();
}
}
}
});
//TODO achievement invalid
//Events.on(ZoneConfigureCompleteEvent.class, e -> {
//if(!content.sectors().contains(z -> !z.canConfigure())){
// configAllZones.complete();
//}
//});
Events.run(Trigger.newGame, () -> Core.app.post(() -> {
if(campaign() && player.core() != null && player.core().items.total() >= 10 * 1000){
drop10kitems.complete();
@@ -113,16 +106,21 @@ public class SStats implements SteamUserStatsCallback{
}
//TODO implement
//if(e.tile.block() == Blocks.daggerFactory){
// buildDaggerFactory.complete();
//}
if(e.tile.block() == Blocks.groundFactory){
buildGroundFactory.complete();
}
if(e.tile.block() == Blocks.meltdown || e.tile.block() == Blocks.spectre){
if(e.tile.block() == Blocks.meltdown && !Core.settings.getBool("meltdownp", false)){
//TODO fix, cleaner impl
if(e.tile.block() == Blocks.meltdown || e.tile.block() == Blocks.spectre || e.tile.block() == Blocks.foreshadow){
if(e.tile.block() == Blocks.meltdown){
Core.settings.put("meltdownp", true);
}
if(e.tile.block() == Blocks.spectre && !Core.settings.getBool("spectrep", false)){
if(e.tile.block() == Blocks.spectre){
Core.settings.put("spectrep", true);
}
if(e.tile.block() == Blocks.foreshadow){
Core.settings.put("spectrep", true);
}
@@ -147,11 +145,6 @@ public class SStats implements SteamUserStatsCallback{
Events.on(UnlockEvent.class, e -> {
if(e.content == Items.thorium) obtainThorium.complete();
if(e.content == Items.titanium) obtainTitanium.complete();
if(!content.sectors().contains(SectorPreset::locked)){
//TODO
//unlockAllZones.complete();
}
});
Events.run(Trigger.openWiki, openWiki::complete);
@@ -197,14 +190,9 @@ public class SStats implements SteamUserStatsCallback{
}
});
//TODO
//Events.on(LaunchEvent.class, e -> {
// if(state.rules.tutorial){
// completeTutorial.complete();
// }
//
// SStat.timesLaunched.add();
//});
Events.on(SectorLaunchEvent.class, e -> {
SStat.timesLaunched.add();
});
Events.on(LaunchItemEvent.class, e -> {
SStat.itemsLaunched.add(e.stack.amount);