Improved controls / Re-added engine sprite

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

@@ -56,8 +56,8 @@ public abstract class BulletType extends Content{
     public boolean collidesTiles = true;
     /** Whether this bullet type collides with tiles that are of the same team. */
     public boolean collidesTeam = false;
-    /** Whether this bullet type collides with air units. */
-    public boolean collidesAir = true;
+    /** Whether this bullet type collides with air/ground units. */
+    public boolean collidesAir = true, collidesGround = true;
     /** Whether this bullet types collides with anything at all. */
     public boolean collides = true;
     /** Whether velocity is inherited from the shooter. */

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

@@ -1,14 +1,12 @@
 package mindustry.entities.bullet;
 
-import arc.math.geom.Rect;
-import arc.util.Time;
-import mindustry.content.Fx;
-import mindustry.entities.Units;
+import arc.util.*;
+import mindustry.content.*;
+import mindustry.entities.*;
 import mindustry.gen.*;
 
 public class FlakBulletType extends BasicBulletType{
-    protected static Rect rect = new Rect();
-    protected float explodeRange = 30f;
+    public float explodeRange = 30f;
 
     public FlakBulletType(float speed, float damage){
         super(speed, damage, "shell");
@@ -17,6 +15,7 @@ public class FlakBulletType extends BasicBulletType{
         hitEffect = Fx.flakExplosionBig;
         bulletWidth = 8f;
         bulletHeight = 10f;
+        collidesGround = false;
     }
 
     public FlakBulletType(){
@@ -29,8 +28,8 @@ public class FlakBulletType extends BasicBulletType{
         if(b.data() instanceof Integer) return;
 
         if(b.timer(2, 6)){
-            Units.nearbyEnemies(b.team(), rect.setSize(explodeRange * 2f).setCenter(b.x(), b.y()), unit -> {
-                if(b.data() instanceof Float) return;
+            Units.nearbyEnemies(b.team(), Tmp.r1.setSize(explodeRange * 2f).setCenter(b.x(), b.y()), unit -> {
+                if(b.data() instanceof Float || (unit.isFlying() && !collidesAir) || (unit.isGrounded() && !collidesGround)) return;
 
                 if(unit.dst(b) < explodeRange){
                     b.data(0);

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

@@ -59,7 +59,8 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
     @Replace
     @Override
     public boolean collides(Hitboxc other){
-        return type.collides && (other instanceof Teamc && ((Teamc)other).team() != team()) && !(other instanceof Flyingc && ((Flyingc)other).isFlying() && !type.collidesAir);
+        return type.collides && (other instanceof Teamc && ((Teamc)other).team() != team())
+            && !(other instanceof Flyingc && ((((Flyingc)other).isFlying() && !type.collidesAir) || (((Flyingc)other).isGrounded() && !type.collidesGround)));
     }
 
     @MethodPriority(100)

core/src/mindustry/entities/def/FlyingComp.java

@@ -12,7 +12,7 @@ import static mindustry.Vars.net;
 
 @Component
 abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{
-    @Import float x, y;
+    @Import float x, y, drag;
     @Import Vec2 vel;
 
     float elevation;
@@ -31,11 +31,24 @@ abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{
         return isGrounded();
     }
 
+    void wobble(){
+        x += Mathf.sin(Time.time() + id() * 99, 25f, 0.05f) * Time.delta() * elevation;
+        y += Mathf.cos(Time.time() + id() * 99, 25f, 0.05f) * Time.delta() * elevation;
+    }
+
     void moveAt(Vec2 vector){
+        moveAt(vector, 1f);
+    }
+
+    void moveAt(Vec2 vector, float acceleration){
         Vec2 t = Tmp.v3.set(vector).scl(floorSpeedMultiplier()); //target vector
-        float mag = Tmp.v3.len();
-        vel.x = Mathf.approach(vel.x, t.x, mag);
-        vel.y = Mathf.approach(vel.y, t.y, mag);
+        Tmp.v1.set(t).sub(vel).limit(acceleration * vector.len()); //delta vector
+        vel.add(Tmp.v1);
+
+        //float mag = Tmp.v3.len() * acceleration;
+        //vel.lerp(t, Tmp.v3.len() * acceleration);
+        //vel.x = Mathf.approach(vel.x, t.x, mag);
+        //vel.y = Mathf.approach(vel.y, t.y, mag);
     }
 
     float floorSpeedMultiplier(){
@@ -47,6 +60,10 @@ abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{
     public void update(){
         Floor floor = floorOn();
 
+        if(isFlying() && !net.client()){
+            wobble();
+        }
+
         if(isGrounded() && floor.isLiquid){
             if((splashTimer += Mathf.dst(deltaX(), deltaY())) >= 7f){
                 floor.walkEffect.at(x, y, 0, floor.color);

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

@@ -144,6 +144,7 @@ abstract class UnitComp implements Healthc, Velc, Statusc, Teamc, Itemsc, Hitbox
 
     @Override
     public void draw(){
+        type.drawEngine(this);
         type.drawBody(this);
         type.drawWeapons(this);
         if(type.drawCell) type.drawCell(this);