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/entities/comp/BuildingComp.java

@@ -1037,7 +1037,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
                 int amount = Math.min(items.get(item), explosionItemCap());
                 explosiveness += item.explosiveness * amount;
                 flammability += item.flammability * amount;
-                power += item.charge * amount * 100f;
+                power += item.charge * Mathf.pow(amount, 1.1f) * 150f;
             }
         }
 

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

@@ -6,12 +6,15 @@ import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
+import mindustry.content.*;
 import mindustry.core.*;
 import mindustry.entities.bullet.*;
 import mindustry.game.*;
 import mindustry.game.Teams.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.world.*;
+import mindustry.world.blocks.environment.*;
 
 import static mindustry.Vars.*;
 
@@ -137,6 +140,20 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
 
         while(x >= 0 && y >= 0 && x < ww && y < wh){
             Building build = world.build(x, y);
+
+            if(type.collideFloor || type.collideTerrain){
+                Tile tile = world.tile(x, y);
+                if(
+                    type.collideFloor && (tile == null || tile.floor().hasSurface() || tile.block() != Blocks.air) ||
+                    type.collideTerrain && tile != null && tile.block() instanceof StaticWall
+                ){
+                    type.despawned(self());
+                    remove();
+                    hit = true;
+                    return;
+                }
+            }
+
             if(build != null && isAdded() && build.collide(self()) && type.testCollision(self(), build)
                 && !build.dead() && (type.collidesTeam || build.team != team) && !(type.pierceBuilding && hasCollided(build.id))){
 

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

@@ -1,29 +1,41 @@
 package mindustry.entities.comp;
 
+import arc.math.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
 
 @Component
-abstract class ChildComp implements Posc{
-    @Import float x, y;
+abstract class ChildComp implements Posc, Rotc{
+    @Import float x, y, rotation;
 
     @Nullable Posc parent;
-    float offsetX, offsetY;
+    boolean rotWithParent;
+    float offsetX, offsetY, offsetPos, offsetRot;
 
     @Override
     public void add(){
         if(parent != null){
             offsetX = x - parent.getX();
             offsetY = y - parent.getY();
+            if(rotWithParent && parent instanceof Rotc r){
+                offsetPos = -r.rotation();
+                offsetRot = rotation - r.rotation();
+            }
         }
     }
 
     @Override
     public void update(){
         if(parent != null){
-            x = parent.getX() + offsetX;
-            y = parent.getY() + offsetY;
+            if(rotWithParent && parent instanceof Rotc r){
+                x = parent.getX() + Angles.trnsx(r.rotation() + offsetPos, offsetX, offsetY);
+                y = parent.getY() + Angles.trnsy(r.rotation() + offsetPos, offsetX, offsetY);
+                rotation = r.rotation() + offsetRot;
+            }else{
+                x = parent.getX() + offsetX;
+                y = parent.getY() + offsetY;
+            }
         }
     }
 }

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

@@ -482,7 +482,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
 
         float explosiveness = 2f + item().explosiveness * stack().amount * 1.53f;
         float flammability = item().flammability * stack().amount / 1.9f;
-        float power = item().charge * stack().amount * 150f;
+        float power = item().charge * Mathf.pow(stack().amount, 1.11f) * 160f;
 
         if(!spawnedByCore){
             Damage.dynamicExplosion(x, y, flammability, explosiveness, power, bounds() / 2f, state.rules.damageExplosions, item().flammability > 1, team, type.deathExplosionEffect);