Campaign changes

core/assets/baseparts/1605280014089.msch

@@ -0,0 +1,2 @@
+msch
xś-�ŃŠ!EouÔŮťBŰÇ~„/ý#™†Ept�Nˇ_mÁăą		�W…)‡Ť0םÖĆôŔň¤şrÜ[,pp˙ÜZl!ÇcókÉ/z†ĺr4bÜjI�ý2%ß_„%…JěźSÂmľ–�W‚©!˝
+€;pęGŹk�…VNf	żJjŞ›ŇĐ8ŹPK¨G8&~m3bfŘÔçźqkľˇ•'ćÄća¦ăbú/(Ű×[¨=[)»

core/assets/baseparts/1605280470180.msch

@@ -0,0 +1 @@
+msch
x�M‘Ϋn„ E7^Ζλ�1ύ�Ύφ��"JƒΨi?ΎµηΐKCd�λή$β�—•S›Ζp(·Ύ³ο–’UΕΡx��oU�»rΪJ�>hΔD½ΙΓ�aΡ��*κ υWj‰>ΰξ�ύ—N»Ση¦ΆYδ�µδv’��ώ©©»xeεΆ]ζύ$ν9�¨�97Ήxχ©ΏIαόIθw^‘Ξ―�jωµΣa¬΅IylΪςπTΎJ”5¨RPDuΎ�*ΟΤάh‹
�ΈQήA4©‘P3n,ΗEF	Ρ‚W��P·Υυ‹‚ΎκϊΉ.�MSΠ“ε�δ�²lθ$¶’>g-JF—qΟΕGΖΔhι$t}Ζ�1ς«ZΪ+XγΞF}Ζΐθω―r6fι1K�,ύ%†T�

core/assets/baseparts/1605280548230.msch

@@ -0,0 +1,2 @@
+msch
xś-Ź[nĂ EŻń;nÓ8űŕ«+Bö(BÂ`
i”˝'qăŻ3sď!pÁU ˛j!taĄ)zúĹ0S�Ľ^ŁvhŃ␍ƨŁ˛úľČÉŮ?z:Ź18ŁĽ\•%#yşët[ČF\V÷ /­›é¨Ł'ł×Ć`Đ‘ÜÝO`
+|C¨p†hxßQĄ°NaÁŰŽ6+}Vú¤”čpJ]—•>ă”1$TřBÓ•Ű{űl/ľa·¬ůÍ3Š?kţ­ř�”4A

core/assets/baseparts/1605281121912.msch

@@ -0,0 +1,2 @@
+msch
xśMŤÍ „géÄj˘'ź˘ß[bL*4c|{gCB`vg?áÚč_
vńq
+ů†aŰ”źky¦8[Z|WĂ‚ľR8Ý})!GŽ
ç5}BcšĂî4>O°;ĹŚ7ͱ(…Ë_ŕNW4Ü\m•®JŹF ¬ĹŔ°“†"®btk!ÂĘho:v]5ůBëNÉľćŇC¬=Nôw–6‡¶;í,tŚJóÁ,;

core/assets/baseparts/752944648628076745.msch

@@ -1,2 +0,0 @@
-msch
xœMŽan„ …Š®ºmMÿöŠètC‚`ºí‰{Š]:àŸ&ïñ˜
=Þ¤Óázh·ª`öÝÒWiS‡Oa!Ìw)(úŽA/ѼzcÿÉyw”6Í¢Ö`¬å^)ÜHE'¾]¼¶j!ƒùL7Â{4Q;“6µx÷E?Ü¡>ñL{y¢œ_‰½ú̇±†“êØÈ–ðÁ…¶$ÊŽ†ˆ¶êj7CÃn‹6ÿŠŽõѳ!Ot-G+ĉæëoíÀè†.?ó£dò␍—Ì�œkr/‰Ô8N4@Ϩƒd41úSq± c%
-ÆÄÉ�M

core/assets/baseparts/754024880747315332.msch

@@ -0,0 +1 @@
+msch
xśMŹkNě0…OÓ6íL�
‰°�üa)ě ´Ö©MJšňX;‚Á®ď•Hä|Ž}l'8ŕ¶@ú™pőä—e˘‡üâĂů„v�áŤ>cÂi	´Í}ö�“ź&Ü­qę“[ú@“cďL°3…‘î‡8?okö1¸3J}ćÍsź3ĄO—řNÉ…8şy›˛wK˘u…MűpfÜX‰Ó{Ďpô‘S?ě-ř9ăć3ş?ĂŃůLł[ă–Âőä_7?ş-€Gč*v+%o^5`8Ô˘t˙E;j�QßhťŃ:ŁąR•ĄÜ$nQVŚEÍh!
ÚćraűBņËŰwŮ ’y-ăF:U:şâc‡Q”ŠJQ+,ŠŁ‘é•<^p@qd
÷é¸b4ŠV�,ąćŚ©ĺă{»ĘŞĘŞĘ˛Ę´ęPŃhżF•ŤüMŔ#%ČĘŽ}+7)ŮÁą>8÷ÚßWI

core/assets/baseparts/755588030362026104.msch

@@ -0,0 +1 @@
+msch
xœ%�]!„öOã³gØC$‘DÀ°`âím)ý˜a†âŠMÁd—¶Ó¿Br-z‹åô®µPqo±¹{:|Éßð+·O}äŽg�ï7.±…tœ¥W0×Ò¹<0Žâa 4Ý5Ã@kL¤câ7#Q2VâJ†e_FØJز­0Kgµ°`(�L#ß-TÑ´Bz›˜;%ÉÜIiVù

core/assets/baseparts/759634196280508416.msch

@@ -0,0 +1 @@
+msch
xś=ŃÍŽ›0†á�ăŹĂßĘt™ŕ:şęŞWŕÉXŁ¨DŕĚĎťw×ÚĽRĹâáű�Źŕ µ|ĎDOîÍËÓO·®×wţĽ{;˙đÓů6ş))ź]~ůF·Ľz9®sĽnnňŁÔ.>ügXÜ%Ě‹”·ű¸úá2O/÷k{ąŹáúîŇŁzM“‡W?ůe+šŰüOó‹˙?űBęEä·HŻ]BĂ
,”ĐŔ	zŮmgd;š‰¨�"iŘSć$”–T@IY‘x¤lI|ŁěyY�4ěÁŔPBŹĐÁ6zźf¦WW°ŁÔ¤”†dáHY�*¨)R'ĘŽÔĂ“l«R°�`áÔĐÂ	z�3u:qo	MĘI†dI©"5¤–ÔA/jź–*YB�†X( ‚Zč —LĄĎr0`ÓęŽif˘‚Zč ® ŹżŰ�ěďźxčďm’şŢ�úµĎ?č

core/assets/baseparts/772860007561166868.msch

@@ -0,0 +1,2 @@
+msch
xśMPŰnë |IâKëćáüÄ‘řŠJçú!›VH,Ś›ćŰ›w­�w–™ťÝĹ8â±@ĺÔYăĎéĹ™xú§ĆčĂőôÔĹę€nŇËĚŤwŔ:«äŚµčLÔgąř5ŚĂEE*ú#†{‹±fôN.gm)áMTάgIö]_YÓŽ«Ťć]Ąún™}ĐrzY0Ś^Y9j�y]ß4ÚŮ_ŘŢůIăń-řŐMň5/K§·*ČY9mqüu‘Ěč}šŐŐz5ýĚţ{‚ůC␍T˘ !P–␍ď(Đ�ˇdAY�V„
+"A␍±#ěPě	‰ě’/ťâŔPšmŰľ ¶ŻmCɬ`v#÷Iî“ĚŤ\U&Ă}TťGŐyTťűÔŘŞíFďzŔŹô]nŇ&5Z�†{ôé%‚Ö}zEË•Ę\¬CŞ@>­gčA_“%(3T	ÚL¶™lł˝Oż!Á˘»7=Ň!9dmČÚ�µ!iߌTys

core/assets/baseparts/772861253630165084.msch

@@ -0,0 +1,3 @@
+msch
xœ%Žknà „ÇØIü¨äV9×È␍ú;¢xS!a@€“úîMÝ%F¬¾Ñ>fz�Æ©™p¾~:“¯¥}ŽëõbU$%MÈÆ;à␍ãCeŠ’~rT:ûˆ^/6›»*ú#y’A9²’Õ7ϧà#É)%ŒÚ++5¹Ímáꘌ5Ú;™f²ì‹18Zf•�–S4Öb0™f™ü5áô¥2w­èƒðÎO„÷ VëÕ$ÙçN+Ÿ1(åíuÞ
+àŒýU¢ü
+‡mIŠR«uâ�80ŽGF‹úÄ©2ш–U…º€›;FÝÖÛßöÜ~·'§ÇbØ3xb`´ÕË_ Ûݾ¼+Ëÿ
©•UÊ

core/assets/baseparts/773972978551226368.msch

@@ -0,0 +1 @@
+msch
xœ%�] „‡ŸÖ³øàm|3U‰i¢­ÁãíevJš�&»1zÄezVŒó}9¿×ÇÔNØßêûÚæ×6¯�/Ó¶ÕöÃއ״ÔGŸv¯‡mýÖà}N?Qäì¨Ìv¶1x™Y(„%½"ž"ÈLBfÒ³´ë'	}"Ï!	vCd•Þ*b‘LðŽAªA*éM‰õˆ(BâIÕ²Ì|¤’�™Ìz!''x™Y(L–Þµ³!Á&`Íï8šÝþ	Ú

core/assets/baseparts/773973064429993996.msch

@@ -0,0 +1 @@
+msch
xśEĎmjĂ0ŕ×ůtÚ´ěů»ÓF–�Î�ŘĹi»ŃnŮIc
óX‘,ËxAŻaă¸zśĂ-ľoa˝/~ŢÓ7űmĘáţ)5ýE=ĄřĺżSF™ÓţđnKË�‡űý‚ţ#‡ůć‡˙ŞŐÇ™«ÂĂŻĂ–ö<y\V?}Ž1Lă2Ě9,€WZhˇ'tPŠv-´&G´�F#PNN8ń9Ť3HÎ*ĆV(„R¨ ,QW�Ď®§ŢA˝9éŞçóůFëÇđJ'jOWYÚkľˇŽˇ,␍u䎡¬T\É´<g!sÔ“r%ç@´Ô—pBÇĎ®ä\-4B+8ˇN™)	[đł*ôŚ"č?G†ŻĽHt•Üő/˘Ü/ĐG6‹

core/assets/baseparts/773973810848333844.msch

@@ -0,0 +1,2 @@
+msch
xœ%ÎÝ‚0à³EÑK_‚;ßÇhp	lËFßÞÎ^,_Û%§Eƒ›†õÃJ¸¹Ù?_ƒ[>�ìÖ¸Ú‰ò˜\Ü\ð@␍[~q�žöuØÜØOÉ-êö�š1ø7}CB7§!¾ÜF}L”3Z.×>‡=�àΔ‚âBk¦ƒs…2\qg`¸W-Á
+•P¡ŽÂIh…3”e.e�-k+Î0Pé’Öñ„ÓþwÔåp(ßøžx&�

core/assets/bundles/bundle.properties

@@ -537,6 +537,12 @@ sectors.nonelaunch = [lightgray]none (sun)
 sectors.rename = Rename Sector
 sector.missingresources = [scarlet]Insufficient Core Resources
 
+threat.low = Low
+threat.medium = Medium
+threat.high = High
+threat.extreme = Extreme
+threat.eradication = Eradication
+
 planet.serpulo.name = Serpulo
 #TODO better name
 planet.sun.name = Sun
@@ -554,6 +560,7 @@ sector.overgrowth.name = Overgrowth
 sector.tarFields.name = Tar Fields
 sector.saltFlats.name = Salt Flats
 sector.fungalPass.name = Fungal Pass
+sector.biomassResearchFacility.name = Biomass Research Facility
 
 #unused
 #sector.crags.name = Crags

core/src/mindustry/content/Blocks.java

@@ -1179,7 +1179,7 @@ public class Blocks implements ContentList{
             size = 2;
             floating = true;
             ambientSound = Sounds.hum;
-            ambientSoundVolume = 0.04f;
+            ambientSoundVolume = 0.06f;
         }};
 
         steamGenerator = new BurnerGenerator("steam-generator"){{
@@ -1217,13 +1217,13 @@ public class Blocks implements ContentList{
 
         solarPanel = new SolarGenerator("solar-panel"){{
             requirements(Category.power, with(Items.lead, 10, Items.silicon, 15));
-            powerProduction = 0.07f;
+            powerProduction = 0.08f;
         }};
 
         largeSolarPanel = new SolarGenerator("solar-panel-large"){{
             requirements(Category.power, with(Items.lead, 100, Items.silicon, 145, Items.phaseFabric, 15));
             size = 3;
-            powerProduction = 0.95f;
+            powerProduction = 1f;
         }};
 
         thoriumReactor = new NuclearReactor("thorium-reactor"){{

core/src/mindustry/content/Bullets.java

@@ -358,6 +358,7 @@ public class Bullets implements ContentList{
             shootEffect = Fx.shootBig;
             pierceCap = 2;
             pierceBuilding = true;
+            knockback = 0.7f;
         }};
 
         standardIncendiaryBig = new BasicBulletType(7f, 60, "bullet"){{

core/src/mindustry/content/SectorPresets.java

@@ -8,7 +8,7 @@ import static mindustry.content.Planets.*;
 public class SectorPresets implements ContentList{
     public static SectorPreset
     groundZero,
-    craters, frozenForest, ruinousShores, stainedMountains, tarFields, fungalPass,
+    craters, biomassFacility, frozenForest, ruinousShores, stainedMountains, tarFields, fungalPass,
     saltFlats, overgrowth,
     impact0078, desolateRift, nuclearComplex;
 
@@ -31,6 +31,11 @@ public class SectorPresets implements ContentList{
             difficulty = 2;
         }};
 
+        biomassFacility = new SectorPreset("biomassResearchFacility", serpulo, 81){{
+            captureWave = 20;
+            difficulty = 3;
+        }};
+
         craters = new SectorPreset("craters", serpulo, 18){{
             captureWave = 20;
             difficulty = 2;
@@ -50,7 +55,7 @@ public class SectorPresets implements ContentList{
             difficulty = 4;
         }};
 
-        overgrowth = new SectorPreset("overgrowth", serpulo, 22){{
+        overgrowth = new SectorPreset("overgrowth", serpulo, 134){{
             difficulty = 5;
         }};
 

core/src/mindustry/content/TechTree.java

@@ -115,7 +115,7 @@ public class TechTree implements ContentList{
                             node(Items.titanium, with(Items.graphite, 3000, Items.copper, 7000, Items.lead, 7000), () -> {
                                 node(pneumaticDrill, () -> {
                                     node(Items.sporePod, with(Items.coal, 4000, Items.graphite, 4000, Items.lead, 4000), () -> {
-                                        node(cultivator, () -> {
+                                        node(cultivator, Seq.with(new SectorComplete(biomassFacility)), () -> {
 
                                         });
                                     });
@@ -524,24 +524,31 @@ public class TechTree implements ContentList{
                         });
                     });
 
-                    node(stainedMountains, Seq.with(
+                    node(biomassFacility, Seq.with(
                         new SectorComplete(frozenForest),
-                        new Research(pneumaticDrill),
                         new Research(powerNode),
-                        new Research(steamGenerator)
+                        new Research(steamGenerator),
+                        new Research(scatter),
+                        new Research(graphitePress)
                     ), () -> {
-                        node(fungalPass, Seq.with(
+                        node(stainedMountains, Seq.with(
-                            new SectorComplete(stainedMountains),
+                            new SectorComplete(biomassFacility),
-                            new Research(groundFactory),
+                            new Research(pneumaticDrill),
-                            new Research(door),
                             new Research(siliconSmelter)
                         ), () -> {
-                            node(nuclearComplex, Seq.with(
+                            node(fungalPass, Seq.with(
-                                new SectorComplete(fungalPass),
+                                new SectorComplete(stainedMountains),
-                                new Research(thermalGenerator),
+                                new Research(groundFactory),
-                                new Research(laserDrill)
+                                new Research(door),
+                                new Research(siliconSmelter)
                             ), () -> {
+                                node(nuclearComplex, Seq.with(
+                                    new SectorComplete(fungalPass),
+                                    new Research(thermalGenerator),
+                                    new Research(laserDrill)
+                                ), () -> {
 
+                                });
                             });
                         });
                     });

core/src/mindustry/core/Logic.java

@@ -80,6 +80,13 @@ public class Logic implements ApplicationListener{
                     state.wavetime = state.rules.waveSpacing;
 
                     SectorDamage.applyCalculatedDamage();
+
+                    //make sure damaged buildings are counted
+                    for(Tile tile : world.tiles){
+                        if(tile.build != null && tile.build.damaged()){
+                            indexer.notifyTileDamaged(tile.build);
+                        }
+                    }
                 }
 
                 //reset values

core/src/mindustry/entities/comp/UnitComp.java

@@ -381,7 +381,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
         }
 
         //remove units spawned by the core
-        if(spawnedByCore && !isPlayer()){
+        if(spawnedByCore && !isPlayer() && !dead){
             Call.unitDespawn(self());
         }
     }

core/src/mindustry/game/SectorInfo.java

@@ -124,7 +124,7 @@ public class SectorInfo{
 
         //assign new wave patterns when the version changes
         if(waveVersion != Waves.waveVersion && state.rules.sector.preset == null){
-            state.rules.spawns = Waves.generate(state.rules.sector.baseCoverage);
+            state.rules.spawns = Waves.generate(state.rules.sector.threat);
         }
 
         CoreBuild entity = state.rules.defaultTeam.core();

core/src/mindustry/game/Waves.java

@@ -285,7 +285,7 @@ public class Waves{
 
             for(int i = start; i < cap;){
                 int f = i;
-                int next = rand.random(8, 16) + curTier * 4;
+                int next = rand.random(8, 16) + (int)Mathf.lerp(4f, 0f, difficulty) + curTier * 4;
 
                 float shieldAmount = Math.max((i - shieldStart) * shieldsPerWave, 0);
                 int space = start == 0 ? 1 : rand.random(1, 2);
@@ -296,8 +296,8 @@ public class Waves{
                     unitAmount = f == start ? 1 : 6 / (int)scaling[ctier];
                     begin = f;
                     end = f + next >= cap ? never : f + next;
-                    max = 14;
+                    max = 13;
-                    unitScaling = (difficulty < 0.4f ? rand.random(2f, 4f) : rand.random(1f, 3f)) * scaling[ctier];
+                    unitScaling = (difficulty < 0.4f ? rand.random(2.5f, 4f) : rand.random(1f, 4f)) * scaling[ctier];
                     shields = shieldAmount;
                     shieldScaling = shieldsPerWave;
                     spacing = space;

core/src/mindustry/input/DesktopInput.java

@@ -401,7 +401,6 @@ public class DesktopInput extends InputHandler{
                 ui.schematics.hide();
             }else{
                 ui.schematics.show();
-                ui.schematics.focusSearchField();
             }
         }
 

core/src/mindustry/maps/generators/BaseGenerator.java

@@ -13,6 +13,7 @@ import mindustry.gen.*;
 import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.blocks.defense.*;
+import mindustry.world.blocks.distribution.*;
 import mindustry.world.blocks.power.*;
 import mindustry.world.blocks.production.*;
 import mindustry.world.meta.*;
@@ -38,9 +39,6 @@ public class BaseGenerator{
 
         Mathf.rand.setSeed(sector.id);
 
-        //TODO limit base size
-        float costBudget = 1000;
-
         Seq<Block> wallsSmall = content.blocks().select(b -> b instanceof Wall && b.size == 1 && b.buildVisibility == BuildVisibility.shown && !(b instanceof Door));
         Seq<Block> wallsLarge = content.blocks().select(b -> b instanceof Wall && b.size == 2 && b.buildVisibility == BuildVisibility.shown && !(b instanceof Door));
 
@@ -51,10 +49,12 @@ public class BaseGenerator{
         //TODO proper difficulty selection
         float bracket = difficulty;
         float bracketRange = 0.2f;
+        float baseChance = Mathf.lerp(0.7f, 1.9f, difficulty);
         int wallAngle = 70; //180 for full coverage
-        double resourceChance = 0.5;
+        double resourceChance = 0.5 * baseChance;
-        double nonResourceChance = 0.0005;
+        double nonResourceChance = 0.0005 * baseChance;
         BasePart coreschem = bases.cores.getFrac(bracket);
+        int passes = difficulty < 0.4 ? 1 : difficulty < 0.8 ? 2 : 3;
 
         Block wall = wallsSmall.getFrac(bracket), wallLarge = wallsLarge.getFrac(bracket);
 
@@ -69,20 +69,22 @@ public class BaseGenerator{
             }
         }
 
-        //random schematics
+        for(int i = 0; i < passes; i++){
-        pass(tile -> {
+            //random schematics
-            if(!tile.block().alwaysReplace) return;
+            pass(tile -> {
+                if(!tile.block().alwaysReplace) return;
 
-            if(((tile.overlay().asFloor().itemDrop != null || (tile.drop() != null && Mathf.chance(nonResourceChance)))
+                if(((tile.overlay().asFloor().itemDrop != null || (tile.drop() != null && Mathf.chance(nonResourceChance)))
                 || (tile.floor().liquidDrop != null && Mathf.chance(nonResourceChance * 2))) && Mathf.chance(resourceChance)){
-                Seq<BasePart> parts = bases.forResource(tile.drop() != null ? tile.drop() : tile.floor().liquidDrop);
+                    Seq<BasePart> parts = bases.forResource(tile.drop() != null ? tile.drop() : tile.floor().liquidDrop);
-                if(!parts.isEmpty()){
+                    if(!parts.isEmpty()){
-                    tryPlace(parts.getFrac(bracket + Mathf.range(bracketRange)), tile.x, tile.y, team);
+                        tryPlace(parts.getFrac(bracket + Mathf.range(bracketRange)), tile.x, tile.y, team);
+                    }
+                }else if(Mathf.chance(nonResourceChance)){
+                    tryPlace(bases.parts.getFrac(bracket + Mathf.range(bracketRange)), tile.x, tile.y, team);
                 }
-            }else if(Mathf.chance(nonResourceChance)){
+            });
-                tryPlace(bases.parts.getFrac(bracket + Mathf.range(bracketRange)), tile.x, tile.y, team);
+        }
-            }
-        });
 
         //replace walls with the correct type (disabled)
         if(false)
@@ -100,6 +102,15 @@ public class BaseGenerator{
                 if(tile.block().alwaysReplace){
                     boolean any = false;
 
+                    for(Point2 p : Geometry.d4){
+                        Tile o = tiles.get(tile.x + p.x, tile.y + p.y);
+
+                        //do not block payloads
+                        if(o != null && (o.block() instanceof PayloadConveyor || o.block() instanceof PayloadAcceptor)){
+                            return;
+                        }
+                    }
+
                     for(Point2 p : Geometry.d8){
                         if(Angles.angleDist(Angles.angle(p.x, p.y), spawn.angleTo(tile)) > wallAngle){
                             continue;

core/src/mindustry/maps/generators/PlanetGenerator.java

@@ -19,7 +19,7 @@ public abstract class PlanetGenerator extends BasicGenerator implements HexMeshe
         boolean any = false;
         float noise = Noise.snoise3(tile.v.x, tile.v.y, tile.v.z, 0.001f, 0.5f);
 
-        if(noise > 0.028){
+        if(noise > 0.027){
             any = true;
         }
 

core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java

@@ -232,6 +232,10 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
             ores.add(Blocks.oreThorium);
         }
 
+        if(rand.chance(0.25)){
+            ores.add(Blocks.oreScrap);
+        }
+
         FloatSeq frequencies = new FloatSeq();
         for(int i = 0; i < ores.size; i++){
             frequencies.add(rand.random(-0.09f, 0.01f) - i * 0.01f);
@@ -250,6 +254,10 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
                     break;
                 }
             }
+
+            if(ore == Blocks.oreScrap && rand.chance(0.33)){
+                floor = Blocks.metalFloorDamaged;
+            }
         });
 
         trimDark();
@@ -326,7 +334,7 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
             }
         });
 
-        float difficulty = sector.baseCoverage;
+        float difficulty = sector.threat;
         ints.clear();
         ints.ensureCapacity(width * height / 4);
 
@@ -417,7 +425,11 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
             state.rules.winWave = sector.info.winWave = 10 + 5 * (int)Math.max(difficulty * 10, 1);
         }
 
+        float waveTimeDec = 0.4f;
+
+        state.rules.waveSpacing = Mathf.lerp(60 * 65 * 2, 60f * 60f * 1f, Math.max(difficulty - waveTimeDec, 0f) / 0.8f);
         state.rules.waves = sector.info.waves = true;
+        state.rules.enemyCoreBuildRadius = 600f;
 
         //TODO better waves
         state.rules.spawns = Waves.generate(difficulty);

core/src/mindustry/type/Planet.java

@@ -186,7 +186,7 @@ public class Planet extends UnlockableContent{
                 sum += 2f;
             }
 
-            sector.baseCoverage = sector.preset == null ? Mathf.clamp(sum / 5f) : Mathf.clamp(sector.preset.difficulty / 10f);
+            sector.threat = sector.preset == null ? Mathf.clamp(sum / 5f) : Mathf.clamp(sector.preset.difficulty / 10f);
         }
     }
 

core/src/mindustry/type/Sector.java

@@ -2,6 +2,8 @@ package mindustry.type;
 
 import arc.*;
 import arc.func.*;
+import arc.graphics.*;
+import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.*;
@@ -28,7 +30,7 @@ public class Sector{
     public SectorInfo info = new SectorInfo();
 
     /** Number 0-1 indicating the difficulty based on nearby bases. */
-    public float baseCoverage;
+    public float threat;
     public boolean generateEnemyBase;
 
     public Sector(Planet planet, Ptile tile){
@@ -54,6 +56,15 @@ public class Sector{
         }
     }
 
+    /** Displays threat as a formatted string. */
+    public String displayThreat(){
+        float step = 0.25f;
+        String color = Tmp.c1.set(Color.white).lerp(Color.scarlet, Mathf.round(threat, step)).toString();
+        String[] threats = {"low", "medium", "high", "extreme", "eradication"};
+        int index = Math.min((int)(threat / step), threats.length - 1);
+        return "[#" + color + "]" + Core.bundle.get("threat." + threats[index]);
+    }
+
     /** @return whether this sector can be landed on at all.
      * Only sectors adjacent to non-wave sectors can be landed on. */
     public boolean unlocked(){

core/src/mindustry/ui/dialogs/PlanetDialog.java

@@ -153,9 +153,9 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
     public void renderSectors(Planet planet){
 
         //draw all sector stuff
-        if(!debugSelect && selectAlpha > 0.01f){
+        if(selectAlpha > 0.01f){
             for(Sector sec : planet.sectors){
-                if(canSelect(sec) || sec.unlocked()){
+                if(canSelect(sec) || sec.unlocked() || debugSelect){
 
                     Color color =
                     sec.hasBase() ? Tmp.c2.set(Team.sharded.color).lerp(Team.crux.color, sec.hasEnemyBase() ? 0.5f : 0f) :
@@ -389,7 +389,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
         stable.add(sector.save != null ? sector.save.getPlayTime() : "@sectors.unexplored").row();
 
         if(sector.isAttacked() || !sector.hasBase()){
-            stable.add("[accent]Difficulty: " + (int)(sector.baseCoverage * 10)).row();
+            stable.add("[accent]Threat: " + sector.displayThreat()).row();
         }
 
         //TODO put most info in submenu

core/src/mindustry/ui/dialogs/SchematicsDialog.java

@@ -283,6 +283,17 @@ public class SchematicsDialog extends BaseDialog{
         Core.scene.setKeyboardFocus(searchField);
     }
 
+    @Override
+    public Dialog show(){
+        super.show();
+
+        if(Core.app.isDesktop()){
+            focusSearchField();
+        }
+
+        return this;
+    }
+
     public static class SchematicImage extends Image{
         public float scaling = 16f;
         public float thickness = 4f;

core/src/mindustry/world/blocks/production/GenericSmelter.java

@@ -16,7 +16,7 @@ public class GenericSmelter extends GenericCrafter{
     public GenericSmelter(String name){
         super(name);
         ambientSound = Sounds.smelter;
-        ambientSoundVolume = 0.06f;
+        ambientSoundVolume = 0.07f;
     }
 
     public class SmelterBuild extends GenericCrafterBuild{