diff --git a/core/assets-raw/fontgen/extra/planet.svg b/core/assets-raw/fontgen/extra/planet.svg new file mode 100644 index 0000000000..17cd9fc3cd --- /dev/null +++ b/core/assets-raw/fontgen/extra/planet.svg @@ -0,0 +1,55 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/core/assets-raw/icons/planet.png b/core/assets-raw/icons/planet.png new file mode 100644 index 0000000000..6a5c136add Binary files /dev/null and b/core/assets-raw/icons/planet.png differ diff --git a/core/src/mindustry/content/TechTree.java b/core/src/mindustry/content/TechTree.java index cf77c5819b..98ff7fd6e8 100644 --- a/core/src/mindustry/content/TechTree.java +++ b/core/src/mindustry/content/TechTree.java @@ -512,8 +512,7 @@ public class TechTree implements ContentList{ new Research(groundFactory), new Research(additiveReconstructor), new Research(airFactory), - new Research(door), - new Research(waterExtractor) + new Research(door) ), () -> { }); diff --git a/desktop/src/mindustry/desktop/steam/SAchievement.java b/desktop/src/mindustry/desktop/steam/SAchievement.java index 845334a539..71e04a2c3c 100644 --- a/desktop/src/mindustry/desktop/steam/SAchievement.java +++ b/desktop/src/mindustry/desktop/steam/SAchievement.java @@ -38,13 +38,12 @@ public enum SAchievement{ buildAllUnits(SStat.unitTypesBuilt, 30), buildT5, pickupT5, - activeAllT5, active10Polys, dieExclusion, drown, fillCoreAllCampaign, hostServer10(SStat.maxPlayersServer, 10), - buildMeltdownSpectreForeshadow, + buildMeltdownSpectre, //technically inaccurate launchItemPad, chainRouters, circleConveyor, diff --git a/desktop/src/mindustry/desktop/steam/SStats.java b/desktop/src/mindustry/desktop/steam/SStats.java index 822efe33cc..49bed6a511 100644 --- a/desktop/src/mindustry/desktop/steam/SStats.java +++ b/desktop/src/mindustry/desktop/steam/SStats.java @@ -65,13 +65,6 @@ public class SStats implements SteamUserStatsCallback{ active10Polys.complete(); } - tmpSet.clear(); - tmpSet.addAll(t5s); - Groups.unit.each(u -> tmpSet.remove(u.type)); - if(tmpSet.size == 0){ - activeAllT5.complete(); - } - for(Building entity : player.team().cores()){ if(!content.items().contains(i -> entity.items.get(i) < entity.block.itemCapacity)){ fillCoreAllCampaign.complete(); @@ -141,7 +134,7 @@ public class SStats implements SteamUserStatsCallback{ if(blocksBuilt.add(e.tile.block().name)){ if(blocksBuilt.contains("meltdown") && blocksBuilt.contains("spectre") && blocksBuilt.contains("foreshadow")){ - buildMeltdownSpectreForeshadow.complete(); + buildMeltdownSpectre.complete(); } save();