From 38471d68d75d218bf70eb2bec391856db8967b55 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 25 Nov 2020 20:23:17 -0500
Subject: [PATCH] Fixed Salt Flats being deadlocked

---
 core/assets-raw/fontgen/extra/planet.svg      |  55 ++++++++++++++++++
 core/assets-raw/icons/planet.png              | Bin 0 -> 578 bytes
 core/src/mindustry/content/TechTree.java      |   3 +-
 .../mindustry/desktop/steam/SAchievement.java |   3 +-
 .../src/mindustry/desktop/steam/SStats.java   |   9 +--
 5 files changed, 58 insertions(+), 12 deletions(-)
 create mode 100644 core/assets-raw/fontgen/extra/planet.svg
 create mode 100644 core/assets-raw/icons/planet.png

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 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg542"
+   sodipodi:docname="planet.svg"
+   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
+  <metadata
+     id="metadata548">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs546" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1316"
+     id="namedview544"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     inkscape:zoom="15.75"
+     inkscape:cx="-16.385458"
+     inkscape:cy="16.16535"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg542" />
+  <path
+     id="polygon2"
+     style="fill:#ffffff"
+     d="M 5.5 0 L 5 0.5 L 4.5 1 L 3.5 1 L 3 1.5 L 2.5 2 L 2 2.5 L 1.5 3 L 1 3.5 L 1 4.5 L 0.5 5 L 0 5.5 L 0 6.5 L 0 7.5 L 0 8.5 L 0 9.5 L 0 10.5 L 0.5 11 L 1 11.5 L 1 12.5 L 1.5 13 L 2 13.5 L 2.5 14 L 3 14.5 L 3.5 15 L 4.5 15 L 5 15.5 L 5.5 16 L 6.5 16 L 7.5 16 L 8.5 16 L 9.5 16 L 10.5 16 L 11 15.5 L 11.5 15 L 12.5 15 L 13 14.5 L 13.5 14 L 14 13.5 L 14.5 13 L 15 12.5 L 15 11.5 L 15.5 11 L 16 10.5 L 16 9.5 L 16 8.5 L 16 7.5 L 16 6.5 L 16 5.5 L 15.5 5 L 15 4.5 L 15 3.5 L 14.5 3 L 14 2.5 L 13.5 2 L 13 1.5 L 12.5 1 L 11.5 1 L 11 0.5 L 10.5 0 L 9.5 0 L 8.5 0 L 7.5 0 L 6.5 0 L 5.5 0 z M 6.5 1 L 7 1.5 L 7.5 2 L 8.5 2 L 9 2.5 L 9 3.5 L 9.5 4 L 10 4.5 L 10.5 5 L 11 5.5 L 11.5 6 L 12.5 6 L 13.5 6 L 14.5 6 L 15 6.5 L 15 7.5 L 15 8.5 L 15 9.5 L 14.5 10 L 14 10.5 L 14 11.5 L 13.5 12 L 13 12.5 L 12.5 13 L 12 13.5 L 11.5 14 L 10.5 14 L 10 14.5 L 9.5 15 L 8.5 15 L 8 14.5 L 7.5 14 L 7 13.5 L 7 12.5 L 7.5 12 L 8 11.5 L 8.5 11 L 9 10.5 L 9 9.5 L 9 8.5 L 8.5 8 L 8 7.5 L 7.5 7 L 6.5 7 L 5.5 7 L 4.5 7 L 4 7.5 L 3.5 8 L 3 8.5 L 2.5 9 L 2 9.5 L 1.5 10 L 1 9.5 L 1 8.5 L 1 7.5 L 1 6.5 L 1.5 6 L 2 5.5 L 2 4.5 L 2.5 4 L 3 3.5 L 3.5 3 L 4 2.5 L 4.5 2 L 5.5 2 L 6 1.5 L 6.5 1 z M 11.5 9 L 11 9.5 L 11 10.5 L 11.5 11 L 12.5 11 L 13 10.5 L 13 9.5 L 12.5 9 L 11.5 9 z " />
+</svg>
diff --git a/core/assets-raw/icons/planet.png b/core/assets-raw/icons/planet.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a5c136add32189c84ea9a0884da3a44a05484d6
GIT binary patch
literal 578
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7TQZ%U13aCb6$*;-(=u~X
z85lGs)=sqbIP4&EG(LE%(p0`O0l_l?b9FkpEV4wq0u--st+kpF^Gner(<3NGhV^<=
zvwU|byLfu6Yz(X82j(M3uX<i|_4*SZlp*-|V4?lJyVZC0GPhLC%nUm&vEb#lnSN?V
za`Iex_AcTUWN_v<dB!MBRg?Ap$I^a=`1g-&PXE6%e{uNPXdaG^BgSV8avzmGTIqZH
z!5)8^RMkjTJ9RnJmrY0dW5R9f9><hKKA0J3Jb9jSpHTNvv#?t;ruy_&OtM&(W%ZOh
zvOn}(^qj3lQ%&EWjF&j~`m}e<a?1`Cu?-xYN+KZ}8;x>~WM1{$IAPh}mj3z!U%j6M
zo!H9g)>j#_z_IM_gZdA<qgNXkzEf=#c6i?XxQ2&$VeEpy;yLe=k7v$dIGFyxEB~i<
zX~M6`U!uIbWf>>tK6tcisb=+or+gRwr<_>!#>;V*(?W(l^Dmk|ZP*vRApPp=wLAMS
zvnx2qF3oFbc1~F0aWmWQ{ky#PZ|@tQ{a45ETcN0&>v;Gr1_p*oPZ!4!i{7chj(i6c
zIHFJf`~UPEOJM{{wNqwxGh;u4=c;Ok8}GCf8GL#c6>O?<m9#u>RmggMMptRqp09av
z(~VcMnKF9ro0~ZO%(Z5(%c@&6FIvw0{`;8pkq_3*S!^nt49jK-Z@gZnH1Ehd&FPxU
jPjriwiU-bI`-8zkF#T87N{%)L1_lOCS3j3^P6<r_d>sDB

literal 0
HcmV?d00001

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();