Bugfixes

core/assets-raw/fontgen/config.json

@@ -498,20 +498,6 @@
         "fill"
       ]
     },
-    {
-      "uid": "06281408f2d30c261c9129e3f167204f",
-      "css": "defense",
-      "code": 59469,
-      "src": "custom_icons",
-      "selected": true,
-      "svg": {
-        "path": "M50 0L0 50V150 250 350 450 550L50 600 100 650 150 700 200 750 250 800 300 850 350 900 400 950 450 1000H550L600 950 650 900 700 850 750 800 800 750 850 700 900 650 950 600 1000 550V450 350 250 150 50L950 0H850L800 50 750 100 700 150 650 200H550 450 350L300 150 250 100 200 50 150 0ZM150 100L200 150 250 200 300 250 350 300H450 550 650L700 250 750 200 800 150 850 100 900 150V250 350 450 550L850 600 800 650 750 700 700 750 650 800 600 850 550 900H450L400 850 350 800 300 750 250 700 200 650 150 600 100 550V450 350 250 150Z",
-        "width": 1000
-      },
-      "search": [
-        "defense"
-      ]
-    },
     {
       "uid": "88103366af75e17d8a3921ee1fb8616c",
       "css": "paste",
@@ -1055,6 +1041,20 @@
       "search": [
         "terrain"
       ]
+    },
+    {
+      "uid": "bdff09f8036a4b1757599b2510a02ffe",
+      "css": "defense",
+      "code": 59469,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M62.5 0L0 62.5V187.5 312.5 437.5 562.5L62.5 625 125 687.5 187.5 750 250 812.5 312.5 875 375 937.5 437.5 1000H562.5L625 937.5 687.5 875 750 812.5 812.5 750 875 687.5 937.5 625 1000 562.5V437.5 312.5 187.5 62.5L937.5 0H812.5L750 62.5 687.5 125H562.5 437.5 312.5L250 62.5 187.5 0ZM187.5 125L250 187.5 312.5 250H437.5 562.5 687.5L750 187.5 812.5 125 875 187.5V312.5 437.5 562.5L812.5 625 750 687.5 687.5 750 625 812.5 562.5 875H437.5L375 812.5 312.5 750 250 687.5 187.5 625 125 562.5V437.5 312.5 187.5Z",
+        "width": 1000
+      },
+      "search": [
+        "defense"
+      ]
     }
   ]
 }

core/src/mindustry/game/Universe.java

@@ -150,8 +150,11 @@ public class Universe{
 
                     //increment seconds passed for this sector by the time that just passed with this turn
                     if(!sector.isBeingPlayed()){
-                        //increment time
-                        sector.info.secondsPassed += turnDuration/60f;
+
+                        //increment time if attacked
+                        if(sector.isAttacked()){
+                            sector.info.secondsPassed += turnDuration/60f;
+                        }
 
                         int wavesPassed = (int)(sector.info.secondsPassed*60f / sector.info.waveSpacing);
                         boolean attacked = sector.info.waves;
@@ -206,7 +209,7 @@ public class Universe{
                     if(!sector.isAttacked() && turn > invasionGracePeriod){
                         //invasion chance depends on # of nearby bases
                         if(Mathf.chance(baseInvasionChance * sector.near().count(Sector::hasEnemyBase))){
-                            int waveMax = Math.max(sector.info.winWave, state.wave) + Mathf.random(2, 5) * 5;
+                            int waveMax = Math.max(sector.info.winWave, sector.isBeingPlayed() ? state.wave : sector.info.wave + sector.info.wavesPassed) + Mathf.random(2, 5) * 5;
 
                             //assign invasion-related things
                             if(sector.isBeingPlayed()){

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

@@ -210,17 +210,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
                 }
             }
         }
-
-        /*
-        //TODO render arcs
-        if(selected != null && selected.preset != null){
-            for(Objective o : selected.preset.requirements){
-                if(o instanceof SectorObjective){
-                    SectorPreset preset = ((SectorObjective)o).preset;
-                    planets.drawArc(planet, selected.tile.v, preset.sector.tile.v);
-                }
-            }
-        }*/
+        
     }
 
     @Override
@@ -228,7 +218,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
 
         for(Sector sec : planet.sectors){
             if(sec != hovered){
-                var icon = (sec.isAttacked() ? Icon.warning : !sec.hasBase() && sec.preset != null ? Icon.terrain : null);
+                var icon = (sec.isAttacked() ? Icon.warning : !sec.hasBase() && sec.preset != null && sec.preset.unlocked() ? Icon.terrain : null);
                 var color = sec.preset != null && !sec.hasBase() ? Team.derelict.color : Team.sharded.color;
 
                 if(icon != null){
@@ -422,6 +412,9 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
         }else if(sector.hasBase() && sector.near().contains(Sector::hasEnemyBase)){
             stable.add("[scarlet]Vulnerable");
             stable.row();
+        }else if(!sector.hasBase() && sector.hasEnemyBase()){
+            stable.add("[scarlet]Enemy Base");
+            stable.row();
         }
 
         if(sector.save != null && sector.info.resources.any()){