From dec5a2aaaffcb9062729a8d2045a21120717a0d9 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 4 Dec 2020 15:07:35 -0500
Subject: [PATCH] Minor campaign tweaks

---
 core/assets/baseparts/772836684403834920.msch     | Bin 243 -> 0 bytes
 core/src/mindustry/ai/BaseAI.java                 |   5 +++--
 core/src/mindustry/content/TechTree.java          |   3 ++-
 core/src/mindustry/game/Universe.java             |   2 +-
 .../metadata/android/en-US/changelogs/29750.txt   |   6 ++++++
 tests/src/test/java/ApplicationTests.java         |   2 --
 tests/src/test/java/power/PowerTestFixture.java   |   1 -
 7 files changed, 12 insertions(+), 7 deletions(-)
 delete mode 100644 core/assets/baseparts/772836684403834920.msch
 create mode 100644 fastlane/metadata/android/en-US/changelogs/29750.txt

diff --git a/core/assets/baseparts/772836684403834920.msch b/core/assets/baseparts/772836684403834920.msch
deleted file mode 100644
index 5d9f41d58f103fe6bd91c25d2de596bfcc798626..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 243
zcmc~TPR?Mgm=inUu3xi*fLnWOYS)gc)ID#xzp(CkGkZ<yVrk7>hRa{xrdmh{@3gG3
z{y+cClarpNM~Ww1Po7gWfBE{qhUbc<-v7RwE@MAwOYAJa<bCIU8g*1u?)z3a>+yvB
z=i8&-R9`ITI#T}gk}BtHyD!;)Pw)TpHu8z@zkN<#&CIGR8rV$(HZb#6Fz8mWIG#$%
z+*4ATWbf)(A1t@@h*ZdFwS#Kb--^7Sb+NHr`@DcL+wrUP&9LtpTm7b{&dTa!J@;t=
w<H5A+JuA-&G_${+X<B+Jtt<VMZ&!L(`Y9<8*_G~Pd=v~#&(|?bV%OFK0Mnj#uK)l5

diff --git a/core/src/mindustry/ai/BaseAI.java b/core/src/mindustry/ai/BaseAI.java
index dd34626dcb..bc089312a0 100644
--- a/core/src/mindustry/ai/BaseAI.java
+++ b/core/src/mindustry/ai/BaseAI.java
@@ -36,7 +36,7 @@ public class BaseAI{
     private static int correct = 0, incorrect = 0;
 
     private int lastX, lastY, lastW, lastH;
-    private boolean triedWalls;
+    private boolean triedWalls, foundPath;
 
     TeamData data;
     Interval timer = new Interval(4);
@@ -125,6 +125,7 @@ public class BaseAI{
                         calcPath.clear();
                         calcTile = null;
                         totalCalcs ++;
+                        foundPath = true;
 
                         break;
                     }
@@ -135,7 +136,7 @@ public class BaseAI{
         }
 
         //only schedule when there's something to build.
-        if(totalCalcs > 0 && data.blocks.isEmpty() && timer.get(timerStep, Mathf.lerp(20f, 4f, data.team.rules().aiTier))){
+        if(foundPath && data.blocks.isEmpty() && timer.get(timerStep, Mathf.lerp(20f, 4f, data.team.rules().aiTier))){
             if(!triedWalls){
                 tryWalls();
                 triedWalls = true;
diff --git a/core/src/mindustry/content/TechTree.java b/core/src/mindustry/content/TechTree.java
index b9e3458698..2e0a0f3646 100644
--- a/core/src/mindustry/content/TechTree.java
+++ b/core/src/mindustry/content/TechTree.java
@@ -462,10 +462,11 @@ public class TechTree implements ContentList{
                                     new Research(conduit),
                                     new Research(wave)
                                 ), () -> {
-                                    //TODO change positions?
                                     node(impact0078, Seq.with(
                                         new SectorComplete(tarFields),
                                         new Research(Items.thorium),
+                                        new Research(lancer),
+                                        new Research(salvo),
                                         new Research(coreFoundation)
                                     ), () -> {
                                         node(desolateRift, Seq.with(
diff --git a/core/src/mindustry/game/Universe.java b/core/src/mindustry/game/Universe.java
index 50f1f006d7..6ebf66afad 100644
--- a/core/src/mindustry/game/Universe.java
+++ b/core/src/mindustry/game/Universe.java
@@ -84,7 +84,7 @@ public class Universe{
         if(state.hasSector()){
             //update sector light
             float light = state.getSector().getLight();
-            float alpha = Mathf.clamp(Mathf.map(light, 0f, 0.8f, 0.2f, 1f));
+            float alpha = Mathf.clamp(Mathf.map(light, 0f, 0.8f, 0.3f, 1f));
 
             //assign and map so darkness is not 100% dark
             state.rules.ambientLight.a = 1f - alpha;
diff --git a/fastlane/metadata/android/en-US/changelogs/29750.txt b/fastlane/metadata/android/en-US/changelogs/29750.txt
new file mode 100644
index 0000000000..19b92fc1cb
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/29750.txt
@@ -0,0 +1,6 @@
+[This is a truncated changelog, see Github for full notes]
+- Leaving sectors while guardians are present is now heavily penalized
+- Made community servers sort by ping
+- Changed "global items" to "total items"
+- Added hint about core item incineration
+- Made sector landing zones display on map when visible but not unlocked
diff --git a/tests/src/test/java/ApplicationTests.java b/tests/src/test/java/ApplicationTests.java
index 1292813e23..a142826e26 100644
--- a/tests/src/test/java/ApplicationTests.java
+++ b/tests/src/test/java/ApplicationTests.java
@@ -85,8 +85,6 @@ public class ApplicationTests{
         }catch(Throwable r){
             fail(r);
         }
-
-        Log.info("init app");
     }
 
     @BeforeEach
diff --git a/tests/src/test/java/power/PowerTestFixture.java b/tests/src/test/java/power/PowerTestFixture.java
index 32ba976b38..701899a11e 100644
--- a/tests/src/test/java/power/PowerTestFixture.java
+++ b/tests/src/test/java/power/PowerTestFixture.java
@@ -25,7 +25,6 @@ public class PowerTestFixture{
 
     @BeforeAll
     static void initializeDependencies(){
-        Log.info("init power test fixture");
         headless = true;
         Core.graphics = new FakeGraphics();
         Core.files = new MockFiles();