From 5c89fa2d2bdb750bdcb40810c3a7a0e130520dc9 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 30 Nov 2020 12:52:10 -0500 Subject: [PATCH] Achievement cleanup --- core/src/mindustry/ui/dialogs/ResearchDialog.java | 13 ------------- .../src/mindustry/desktop/steam/SAchievement.java | 6 +++--- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/core/src/mindustry/ui/dialogs/ResearchDialog.java b/core/src/mindustry/ui/dialogs/ResearchDialog.java index bb609cb167..49701dbe76 100644 --- a/core/src/mindustry/ui/dialogs/ResearchDialog.java +++ b/core/src/mindustry/ui/dialogs/ResearchDialog.java @@ -257,18 +257,6 @@ public class ResearchDialog extends BaseDialog{ return node.content.unlocked() || !node.objectives.contains(i -> !i.complete()); } - public void showToast(String info){ - Table table = new Table(); - table.actions(Actions.fadeOut(0.5f, Interp.fade), Actions.remove()); - table.top().add(info); - table.name = "toast"; - table.update(() -> { - table.toFront(); - table.setPosition(Core.graphics.getWidth() / 2f, Core.graphics.getHeight() - 21, Align.top); - }); - Core.scene.add(table); - } - boolean locked(TechNode node){ return node.content.locked(); } @@ -451,7 +439,6 @@ public class ResearchDialog extends BaseDialog{ void unlock(TechNode node){ node.content.unlock(); - showToast(Core.bundle.format("researched", node.content.localizedName)); checkNodes(root); hoverNode = null; treeLayout(); diff --git a/desktop/src/mindustry/desktop/steam/SAchievement.java b/desktop/src/mindustry/desktop/steam/SAchievement.java index 71e04a2c3c..ffa429c868 100644 --- a/desktop/src/mindustry/desktop/steam/SAchievement.java +++ b/desktop/src/mindustry/desktop/steam/SAchievement.java @@ -5,8 +5,8 @@ public enum SAchievement{ kill100kEnemies(SStat.unitsDestroyed, 100_000), launch100kItems(SStat.itemsLaunched, 100_000), - produce1kMin(SStat.maxProduction, 1000), - produce20kMin(SStat.maxProduction, 20_000), + produce5kMin(SStat.maxProduction, 5000), + produce50kMin(SStat.maxProduction, 50_000), win10Attack(SStat.attacksWon, 10), win10PvP(SStat.pvpsWon, 10), defeatAttack5Waves, @@ -25,7 +25,7 @@ public enum SAchievement{ publishMap(SStat.mapsPublished, 1), defeatBoss(SStat.bossesDefeated, 1), captureAllSectors, - control10Sectors, + control10Sectors(SStat.sectorsControlled, 10), drop10kitems, powerupImpactReactor, obtainThorium,