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

Achievement cleanup

Browse Source
This commit is contained in:
Anuken
2020-11-30 12:52:10 -05:00
parent 639702ae1a
commit 5c89fa2d2b
2 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/mindustry/ui/dialogs/ResearchDialog.java
View File

@@ -257,18 +257,6 @@ public class ResearchDialog extends BaseDialog{
return node.content.unlocked() || !node.objectives.contains(i -> !i.complete()); 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){ boolean locked(TechNode node){
return node.content.locked(); return node.content.locked();
} }
@@ -451,7 +439,6 @@ public class ResearchDialog extends BaseDialog{
void unlock(TechNode node){ void unlock(TechNode node){
node.content.unlock(); node.content.unlock();
showToast(Core.bundle.format("researched", node.content.localizedName));
checkNodes(root); checkNodes(root);
hoverNode = null; hoverNode = null;
treeLayout(); treeLayout();

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

@@ -5,8 +5,8 @@ public enum SAchievement{
kill100kEnemies(SStat.unitsDestroyed, 100_000), kill100kEnemies(SStat.unitsDestroyed, 100_000),
launch100kItems(SStat.itemsLaunched, 100_000), launch100kItems(SStat.itemsLaunched, 100_000),
produce1kMin(SStat.maxProduction, 1000), produce5kMin(SStat.maxProduction, 5000),
produce20kMin(SStat.maxProduction, 20_000), produce50kMin(SStat.maxProduction, 50_000),
win10Attack(SStat.attacksWon, 10), win10Attack(SStat.attacksWon, 10),
win10PvP(SStat.pvpsWon, 10), win10PvP(SStat.pvpsWon, 10),
defeatAttack5Waves, defeatAttack5Waves,
@@ -25,7 +25,7 @@ public enum SAchievement{
publishMap(SStat.mapsPublished, 1), publishMap(SStat.mapsPublished, 1),
defeatBoss(SStat.bossesDefeated, 1), defeatBoss(SStat.bossesDefeated, 1),
captureAllSectors, captureAllSectors,
control10Sectors, control10Sectors(SStat.sectorsControlled, 10),
drop10kitems, drop10kitems,
powerupImpactReactor, powerupImpactReactor,
obtainThorium, obtainThorium,