Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

 Conflicts:

	core/assets/logicids.dat

	core/src/mindustry/content/Blocks.java

	gradle.properties

core/src/mindustry/content/Blocks.java

@@ -35,7 +35,7 @@ public class Blocks implements ContentList{
     public static Block
 
     //environment
-    air, spawn, cliff, deepwater, water, taintedWater, deepTaintedWater, tar, slag, stone, craters, charr, sand, darksand, dirt, mud, ice, snow, darksandTaintedWater, space, empty,
+    air, spawn, cliff, deepwater, water, taintedWater, deepTaintedWater, tar, slag, cryofluid, stone, craters, charr, sand, darksand, dirt, mud, ice, snow, darksandTaintedWater, space, empty,
     dacite, rhyolite, rhyoliteCrater, regolith, yellowStone, redIce,
     redmat, bluemat,
     stoneWall, dirtWall, sporeWall, iceWall, daciteWall, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster,
@@ -210,6 +210,22 @@ public class Blocks implements ContentList{
             cacheLayer = CacheLayer.tar;
         }};
 
+        cryofluid = new Floor("pooled-cryofluid"){{
+            drownTime = 150f;
+            status = StatusEffects.freezing;
+            statusDuration = 240f;
+            speedMultiplier = 0.5f;
+            variants = 0;
+            liquidDrop = Liquids.cryofluid;
+            liquidMultiplier = 0.5f;
+            isLiquid = true;
+            cacheLayer = CacheLayer.cryofluid;
+
+            emitLight = true;
+            lightRadius = 25f;
+            lightColor = Color.cyan.cpy().a(0.19f);
+        }};
+
         slag = new Floor("molten-slag"){{
             drownTime = 230f;
             status = StatusEffects.melting;
@@ -1060,6 +1076,7 @@ public class Blocks implements ContentList{
         }};
 
         thruster = new Thruster("thruster"){{
+            requirements(Category.defense, BuildVisibility.sandboxOnly, with(Items.scrap, 96));
             health = 55 * 16 * wallHealthMultiplier;
             size = 4;
         }};

core/src/mindustry/content/Fx.java

@@ -369,13 +369,13 @@ public class Fx{
 
         Fill.circle(e.x, e.y, e.fin() * 10);
         Drawf.light(e.x, e.y, e.fin() * 20f, Pal.heal, 0.7f);
-    }).followParent(true),
+    }).followParent(true).rotWithParent(true),
 
     greenLaserChargeSmall = new Effect(40f, 100f, e -> {
         color(Pal.heal);
         stroke(e.fin() * 2f);
         Lines.circle(e.x, e.y, e.fout() * 50f);
-    }).followParent(true),
+    }).followParent(true).rotWithParent(true),
 
     greenCloud = new Effect(80f, e -> {
         color(Pal.heal);
@@ -1975,7 +1975,7 @@ public class Fx{
         }
 
         Lines.endLine();
-    }).followParent(false),
+    }).followParent(false).rotWithParent(false),
 
     chainEmp = new Effect(30f, 300f, e -> {
         if(!(e.data instanceof Position p)) return;
@@ -2012,5 +2012,5 @@ public class Fx{
         }
 
         Lines.endLine();
-    }).followParent(false);
+    }).followParent(false).rotWithParent(false);
 }

core/src/mindustry/content/UnitTypes.java

@@ -1787,7 +1787,6 @@ public class UnitTypes implements ContentList{
         //endregion
         //region naval support
         retusa = new UnitType("retusa"){{
-            defaultController = HugAI::new;
             speed = 0.9f;
             targetAir = false;
             drag = 0.14f;
@@ -1821,15 +1820,17 @@ public class UnitTypes implements ContentList{
 
             weapons.add(new Weapon(){{
                 mirror = false;
-                reload = 80f;
+                rotate = true;
+                reload = 90f;
                 shots = 3;
                 shotDelay = 7f;
                 x = y = shootX = shootY = 0f;
                 shootSound = Sounds.mineDeploy;
+                rotateSpeed = 180f;
 
                 bullet = new BasicBulletType(){{
                     sprite = "mine-bullet";
-                    width = height = 11f;
+                    width = height = 8f;
                     layer = Layer.scorch;
                     shootEffect = smokeEffect = Fx.none;
 
@@ -1843,23 +1844,31 @@ public class UnitTypes implements ContentList{
 
                     hitSound = Sounds.plasmaboom;
 
-                    shootCone = 360f;
                     ejectEffect = Fx.none;
                     hitSize = 22f;
 
                     collidesAir = false;
 
-                    lifetime = 500f;
+                    lifetime = 87f;
 
                     hitEffect = new MultiEffect(Fx.blastExplosion, Fx.greenCloud);
                     keepVelocity = false;
 
                     shrinkX = shrinkY = 0f;
 
-                    speed = 0f;
+                    inaccuracy = 2f;
+                    weaveMag = 5f;
+                    weaveScale = 4f;
+                    speed = 0.7f;
+                    drag = -0.017f;
+                    homingPower = 0.05f;
+                    collideFloor = true;
+                    trailColor = Pal.heal;
+                    trailWidth = 3f;
+                    trailLength = 8;
 
-                    splashDamage = 55f;
-                    splashDamageRadius = 45f;
+                    splashDamage = 33f;
+                    splashDamageRadius = 32f;
                 }};
             }});
         }};
@@ -1934,7 +1943,7 @@ public class UnitTypes implements ContentList{
                     shootEffect = Fx.sparkShoot;
                     hitEffect = Fx.pointHit;
                     maxRange = 100f;
-                    damage = 15f;
+                    damage = 17f;
                 }};
             }});