Merge remote-tracking branch 'origin/7.0-features' into 7.0-features

core/assets/bundles/bundle.properties

@@ -577,7 +577,7 @@ configure = Configure Loadout
 objective.research = [accent]Research:\n[]{0}[lightgray]{1}
 objective.produce = [accent]Obtain:\n[]{0}[lightgray]{1}
 objective.destroyblock = [accent]Destroy:\n[]{0}[lightgray]{1}
-objective.destroyblocks = [accent]Destroy: [lightgray]{0}[]/{1}\n{2}[lightgray]{3}
+objective.destroyblocks = [accent]Destroy: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3}
 objective.item = [accent]Obtain: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
 objective.coreitem = [accent]Move into Core:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3}
 objective.build = [accent]Build: [][lightgray]{0}[]x\n{1}[lightgray]{2}

core/src/mindustry/content/SectorPresets.java

@@ -1,7 +1,6 @@
 package mindustry.content;
 
-import arc.graphics.Color;
+import arc.math.geom.*;
-import arc.math.geom.Point2;
 import mindustry.game.MapObjectives.*;
 import mindustry.game.*;
 import mindustry.graphics.*;
@@ -208,11 +207,11 @@ public class SectorPresets{
 
             rules = r -> {
                 r.objectives.addAll(
-                        new DestroyBlocksObjective(Blocks.coreBastion, Team.malis, Point2.pack(290,501), Point2.pack(158,496)),
+                    new DestroyBlocksObjective(Blocks.coreBastion, Team.malis, Point2.pack(290,501), Point2.pack(158,496)),
-                        new TimerObjective("Nuclear launch detected", 4 * 60 * 60).withMarkers(
+                    new TimerObjective("[accent]⚠ Nuclear launch detected:\n[lightgray]{0}", 4 * 60 * 60).withMarkers(
-                                new TextMarker("Evacuate base", 1, 1),
+                        new TextMarker("Evacuate base", 1, 1),
-                                new MinimapMarker(338,378, Color.red)
+                        new MinimapMarker(338,378, Pal.remove)
-                        ).withFlags("nuke1")
+                    ).withFlags("nuke1")
                 );
             };
         }};

core/src/mindustry/entities/bullet/BulletType.java

@@ -305,13 +305,7 @@ public class BulletType extends Content implements Cloneable{
         Effect.shake(hitShake, hitShake, b);
 
         createFrags(b, x, y);
-
+        createPuddles(b, x, y);
-        if(puddleLiquid != null && puddles > 0){
-            for(int i = 0; i < puddles; i++){
-                Tile tile = world.tileWorld(x + Mathf.range(puddleRange), y + Mathf.range(puddleRange));
-                Puddles.deposit(tile, puddleLiquid, puddleAmount);
-            }
-        }
 
         if(incendChance > 0 && Mathf.chance(incendChance)){
             Damage.createIncend(x, y, incendSpread, incendAmount);
@@ -329,6 +323,15 @@ public class BulletType extends Content implements Cloneable{
         }
     }
 
+    public void createPuddles(Bullet b, float x, float y){
+        if(puddleLiquid != null && puddles > 0){
+            for(int i = 0; i < puddles; i++){
+                Tile tile = world.tileWorld(x + Mathf.range(puddleRange), y + Mathf.range(puddleRange));
+                Puddles.deposit(tile, puddleLiquid, puddleAmount);
+            }
+        }
+    }
+
     public void createSplashDamage(Bullet b, float x, float y){
         if(splashDamageRadius > 0 && !b.absorbed){
             Damage.damage(b.team, x, y, splashDamageRadius, splashDamage * b.damageMultiplier(), false, collidesAir, collidesGround, scaledSplashDamage, b);

core/src/mindustry/game/MapObjectives.java

@@ -308,7 +308,7 @@ public class MapObjectives{
 
         @Override
         public String text(){
-            return Core.bundle.format("objective.destroyblocks", positions, positions.length, block.emoji(), block.localizedName);
+            return Core.bundle.format("objective.destroyblocks", progress(), positions.length, block.emoji(), block.localizedName);
         }
     }
 

core/src/mindustry/world/blocks/distribution/Conveyor.java

@@ -44,6 +44,7 @@ public class Conveyor extends Block implements Autotiler{
         itemCapacity = capacity;
         priority = TargetPriority.transport;
         conveyorPlacement = true;
+        underBullets = true;
 
         ambientSound = Sounds.conveyor;
         ambientSoundVolume = 0.0022f;

core/src/mindustry/world/blocks/distribution/ItemBridge.java

@@ -44,6 +44,7 @@ public class ItemBridge extends Block{
         super(name);
         update = true;
         solid = true;
+        underBullets = true;
         hasPower = true;
         itemCapacity = 10;
         configurable = true;

core/src/mindustry/world/blocks/distribution/Junction.java

@@ -16,7 +16,8 @@ public class Junction extends Block{
     public Junction(String name){
         super(name);
         update = true;
-        solid = true;
+        solid = false;
+        underBullets = true;
         group = BlockGroup.transportation;
         unloadable = false;
         noUpdateDisabled = true;

core/src/mindustry/world/blocks/distribution/OverflowGate.java

@@ -15,7 +15,7 @@ public class OverflowGate extends Block{
     public OverflowGate(String name){
         super(name);
         hasItems = true;
-        solid = true;
+        underBullets = true;
         update = false;
         destructible = true;
         group = BlockGroup.transportation;

core/src/mindustry/world/blocks/distribution/Router.java

@@ -15,7 +15,7 @@ public class Router extends Block{
     public Router(String name){
         super(name);
         solid = true;
-        update = true;
+        underBullets = true;
         hasItems = true;
         itemCapacity = 1;
         group = BlockGroup.transportation;

core/src/mindustry/world/blocks/distribution/Sorter.java

@@ -21,7 +21,7 @@ public class Sorter extends Block{
         super(name);
         update = false;
         destructible = true;
-        solid = true;
+        underBullets = true;
         instantTransfer = true;
         group = BlockGroup.transportation;
         configurable = true;

core/src/mindustry/world/blocks/distribution/StackConveyor.java

@@ -52,6 +52,7 @@ public class StackConveyor extends Block implements Autotiler{
         itemCapacity = 10;
         conveyorPlacement = true;
         highUnloadPriority = true;
+        underBullets = true;
         priority = TargetPriority.transport;
 
         ambientSound = Sounds.conveyor;

core/src/mindustry/world/blocks/liquid/Conduit.java

@@ -46,6 +46,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
         rotate = true;
         solid = false;
         floating = true;
+        underBullets = true;
         conveyorPlacement = true;
         noUpdateDisabled = true;
         canOverdrive = false;

core/src/mindustry/world/blocks/liquid/LiquidRouter.java

@@ -12,6 +12,8 @@ public class LiquidRouter extends LiquidBlock{
     public LiquidRouter(String name){
         super(name);
 
+        underBullets = true;
+        solid = false;
         noUpdateDisabled = true;
         canOverdrive = false;
     }