Implemented flying for desktop, new ship bodies

core/assets/sprites/sprites.atlas

@@ -41,14 +41,14 @@ laserconveyor-end
   index: -1
 mass-driver-turret
   rotate: false
-  xy: 307, 135
+  xy: 281, 135
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ripple
   rotate: false
-  xy: 307, 135
+  xy: 281, 135
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -398,7 +398,7 @@ dirt3
   index: -1
 dirtedge
   rotate: false
-  xy: 197, 2
+  xy: 991, 433
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -433,7 +433,7 @@ grassblock2
   index: -1
 grassedge
   rotate: false
-  xy: 253, 41
+  xy: 251, 27
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -454,7 +454,7 @@ ice3
   index: -1
 iceedge
   rotate: false
-  xy: 251, 27
+  xy: 251, 13
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -510,7 +510,7 @@ iron3
   index: -1
 lavaedge
   rotate: false
-  xy: 251, 13
+  xy: 991, 419
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -566,7 +566,7 @@ metalfloor6
   index: -1
 metalflooredge
   rotate: false
-  xy: 607, 106
+  xy: 621, 106
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -580,7 +580,7 @@ mossblock
   index: -1
 oiledge
   rotate: false
-  xy: 621, 106
+  xy: 635, 106
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -629,7 +629,7 @@ sandblock3
   index: -1
 sandedge
   rotate: false
-  xy: 635, 106
+  xy: 649, 106
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -678,14 +678,14 @@ snowblock3
   index: -1
 snowedge
   rotate: false
-  xy: 641, 200
+  xy: 641, 186
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 spaceedge
   rotate: false
-  xy: 641, 186
+  xy: 641, 172
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -895,7 +895,7 @@ cross-2
   index: -1
 cross-3
   rotate: false
-  xy: 572, 258
+  xy: 229, 143
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -1147,21 +1147,21 @@ liquidrouter-top
   index: -1
 liquidtank-bottom
   rotate: false
-  xy: 229, 117
+  xy: 598, 258
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquidtank-liquid
   rotate: false
-  xy: 255, 127
+  xy: 229, 117
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquidtank-top
   rotate: false
-  xy: 281, 135
+  xy: 255, 127
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -1504,7 +1504,7 @@ siliconextractor
   index: -1
 core-open
   rotate: false
-  xy: 229, 143
+  xy: 571, 157
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -1609,14 +1609,14 @@ duo
   index: -1
 fuse
   rotate: false
-  xy: 598, 258
+  xy: 572, 258
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 spectre
   rotate: false
-  xy: 598, 258
+  xy: 572, 258
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -1719,6 +1719,20 @@ walkerfactory-top-open
   orig: 16, 16
   offset: 0, 0
   index: -1
+mech-factory
+  rotate: false
+  xy: 307, 135
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+ship-factory
+  rotate: false
+  xy: 307, 135
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
 reconstructor-open
   rotate: false
   xy: 387, 81
@@ -1819,7 +1833,7 @@ enemyarrow
   index: -1
 error
   rotate: false
-  xy: 1005, 433
+  xy: 773, 340
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -2510,34 +2524,6 @@ core-top
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-icon-mech-factory
-  rotate: false
-  xy: 519, 183
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-mech-factory
-  rotate: false
-  xy: 519, 183
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-ship-factory
-  rotate: false
-  xy: 519, 183
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-block-icon-ship-factory
-  rotate: false
-  xy: 519, 183
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
 block-icon-mechanical-pump
   rotate: false
   xy: 415, 43
@@ -2603,21 +2589,21 @@ multiplexer
   index: -1
 block-icon-nuclear-reactor
   rotate: false
-  xy: 545, 183
+  xy: 519, 183
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 nuclear-reactor
   rotate: false
-  xy: 545, 183
+  xy: 519, 183
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-icon-nucleardrill
   rotate: false
-  xy: 571, 183
+  xy: 545, 183
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2638,7 +2624,7 @@ oil
   index: -1
 block-icon-oilextractor
   rotate: false
-  xy: 467, 150
+  xy: 571, 183
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2841,7 +2827,7 @@ resupplypoint
   index: -1
 block-icon-ripple
   rotate: false
-  xy: 493, 157
+  xy: 467, 150
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3275,28 +3261,28 @@ unloader
   index: -1
 block-icon-vault
   rotate: false
-  xy: 519, 157
+  xy: 493, 157
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 vault
   rotate: false
-  xy: 519, 157
+  xy: 493, 157
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-icon-warpgate
   rotate: false
-  xy: 545, 157
+  xy: 519, 157
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 warpgate
   rotate: false
-  xy: 545, 157
+  xy: 519, 157
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3331,35 +3317,56 @@ block-icon-wave
   index: -1
 mech-icon-alpha-mech
   rotate: false
-  xy: 991, 419
+  xy: 1005, 419
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-delta-mech
   rotate: false
-  xy: 991, 419
+  xy: 1005, 419
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-omega-mech
   rotate: false
-  xy: 991, 419
+  xy: 1005, 419
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-tau-mech
   rotate: false
-  xy: 991, 419
+  xy: 1005, 419
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
-mech-icon-standard-ship
+mech-icon-dart-ship
   rotate: false
-  xy: 1005, 419
+  xy: 607, 106
+  size: 12, 12
+  orig: 12, 12
+  offset: 0, 0
+  index: -1
+mech-icon-halberd-ship
+  rotate: false
+  xy: 607, 106
+  size: 12, 12
+  orig: 12, 12
+  offset: 0, 0
+  index: -1
+mech-icon-javelin-ship
+  rotate: false
+  xy: 607, 106
+  size: 12, 12
+  orig: 12, 12
+  offset: 0, 0
+  index: -1
+mech-icon-trident-ship
+  rotate: false
+  xy: 607, 106
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -3651,9 +3658,30 @@ scout-leg
   orig: 12, 12
   offset: 0, 0
   index: -1
-standard-ship
+dart-ship
   rotate: false
-  xy: 641, 172
+  xy: 197, 2
+  size: 12, 12
+  orig: 12, 12
+  offset: 0, 0
+  index: -1
+halberd-ship
+  rotate: false
+  xy: 197, 2
+  size: 12, 12
+  orig: 12, 12
+  offset: 0, 0
+  index: -1
+javelin-ship
+  rotate: false
+  xy: 197, 2
+  size: 12, 12
+  orig: 12, 12
+  offset: 0, 0
+  index: -1
+trident-ship
+  rotate: false
+  xy: 197, 2
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -3766,7 +3794,7 @@ button-map-over
   index: -1
 button-select
   rotate: false
-  xy: 571, 157
+  xy: 545, 157
   size: 24, 24
   split: 4, 4, 4, 4
   orig: 24, 24
@@ -4668,14 +4696,14 @@ window-empty
   index: -1
 drone
   rotate: false
-  xy: 991, 433
+  xy: 1005, 433
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 scout
   rotate: false
-  xy: 649, 106
+  xy: 641, 200
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -4745,7 +4773,7 @@ clustergun-equip
   index: -1
 generic-weapon
   rotate: false
-  xy: 773, 340
+  xy: 253, 41
   size: 12, 12
   orig: 12, 12
   offset: 0, 0

core/src/io/anuke/mindustry/content/Mechs.java

@@ -7,7 +7,7 @@ import io.anuke.mindustry.type.Mech;
 import io.anuke.mindustry.type.Upgrade;
 
 public class Mechs implements ContentList {
-    public static Mech alpha, delta, tau, omega, standardShip;
+    public static Mech alpha, delta, tau, omega, dart, trident, javelin, halberd;
 
     /**These are not new mechs, just re-assignments for convenience.*/
     public static Mech starterDesktop, starterMobile;
@@ -39,14 +39,36 @@ public class Mechs implements ContentList {
             maxSpeed = 1.0f;
         }};
 
-        standardShip = new Mech("standard-ship", true){{
+        dart = new Mech("dart-ship", true){{
+            drillPower = -1;
+            speed = 0.4f;
+            maxSpeed = 3f;
+            drag = 0.1f;
+        }};
+
+        trident = new Mech("trident-ship", true){{
             drillPower = 1;
             speed = 0.4f;
             maxSpeed = 3f;
+            drag = 0.1f;
+        }};
+
+        javelin = new Mech("javelin-ship", true){{
+            drillPower = -1;
+            speed = 0.4f;
+            maxSpeed = 3f;
+            drag = 0.1f;
+        }};
+
+        halberd = new Mech("halberd-ship", true){{
+            drillPower = 2;
+            speed = 0.4f;
+            maxSpeed = 3f;
+            drag = 0.1f;
         }};
 
         starterDesktop = alpha;
-        starterMobile = standardShip;
+        starterMobile = dart;
     }
 
     @Override

core/src/io/anuke/mindustry/content/Recipes.java

@@ -131,6 +131,10 @@ public class Recipes implements ContentList{
         new Recipe(units, UpgradeBlocks.deltaFactory, new ItemStack(Items.iron, 1));
         new Recipe(units, UpgradeBlocks.tauFactory, new ItemStack(Items.iron, 1));
 
+        new Recipe(units, UpgradeBlocks.tridentFactory, new ItemStack(Items.iron, 1));
+        new Recipe(units, UpgradeBlocks.javelinFactory, new ItemStack(Items.iron, 1));
+        new Recipe(units, UpgradeBlocks.halberdFactory, new ItemStack(Items.iron, 1));
+
         new Recipe(units, DebugBlocks.itemSource, new ItemStack(Items.steel, 10)).setDebug();
         new Recipe(units, DebugBlocks.itemVoid, new ItemStack(Items.steel, 10)).setDebug();
         new Recipe(units, DebugBlocks.liquidSource, new ItemStack(Items.steel, 10)).setDebug();

core/src/io/anuke/mindustry/content/blocks/UpgradeBlocks.java

@@ -5,7 +5,7 @@ import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.blocks.production.MechFactory;
 
 public class UpgradeBlocks extends BlockList {
-    public static Block deltaFactory, tauFactory, omegaFactory;
+    public static Block deltaFactory, tauFactory, omegaFactory, tridentFactory, javelinFactory, halberdFactory;
 
     @Override
     public void load() {
@@ -23,5 +23,20 @@ public class UpgradeBlocks extends BlockList {
             mech = Mechs.omega;
             size = 3;
         }};
+
+        tridentFactory = new MechFactory("trident-ship-factory"){{
+            mech = Mechs.trident;
+            size = 2;
+        }};
+
+        javelinFactory = new MechFactory("javelin-ship-factory"){{
+            mech = Mechs.javelin;
+            size = 2;
+        }};
+
+        halberdFactory = new MechFactory("halberd-ship-factory"){{
+            mech = Mechs.halberd;
+            size = 3;
+        }};
     }
 }

core/src/io/anuke/mindustry/core/Renderer.java

@@ -144,9 +144,8 @@ public class Renderer extends RendererModule{
 			Graphics.clear(Color.BLACK);
 		}else{
             Vector2 position = averagePosition();
-            boolean flying = players[0].isFlying();
 
-            if(!flying){
+            if(!mobile){
             	setCamera(position.x, position.y);
 			}
 

core/src/io/anuke/mindustry/entities/Player.java

@@ -411,7 +411,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait {
 			return;
 		}
 
-		if(mech.flying){
+		if(mobile){
 			updateFlying();
 		}else{
 			updateMech();
@@ -434,7 +434,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait {
 		Tile tile = world.tileWorld(x, y);
 
 		//if player is in solid block
-		if(tile != null && tile.solid() && !noclip) {
+		if(!mech.flying && tile != null && tile.solid() && !noclip) {
 			damage(health + 1); //die instantly
 		}
 
@@ -445,6 +445,13 @@ public class Player extends Unit implements BuilderTrait, CarryTrait {
 
 		speed *= ((1f-carrySlowdown) +  (inventory.hasItem() ? (float)inventory.getItem().amount/inventory.capacity(): 1f) * carrySlowdown);
 
+		if(mech.flying){
+			//prevent strafing backwards, have a penalty for doing so
+			float angDist = Angles.angleDist(rotation, velocity.angle()) / 180f;
+			float penalty = 0.2f;
+			speed *= Mathf.lerp(1f, penalty, angDist);
+		}
+
 		//drop from carrier on key press
 		if(Inputs.keyTap("drop_unit") && getCarrier() != null){
 			getCarrier().dropCarry();
@@ -472,7 +479,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait {
 
 		velocity.add(movement);
 
-		updateVelocityStatus(0.4f, speed);
+		updateVelocityStatus(mech.drag, mech.maxSpeed);
 
 		if(!movement.isZero()){
 			walktime += Timers.delta() * velocity.len()*(1f/0.5f)/speed * getFloorOn().speedMultiplier;
@@ -526,7 +533,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait {
 		}
 
 		velocity.add(movement);
-		updateVelocityStatus(0.1f, mech.maxSpeed);
+		updateVelocityStatus(mech.drag, mech.maxSpeed);
 
 		//hovering effect
 		x += Mathf.sin(Timers.time() + id * 999, 25f, 0.08f);

core/src/io/anuke/mindustry/type/Mech.java

@@ -9,6 +9,7 @@ public class Mech extends Upgrade {
 
 	public float speed = 1.1f;
 	public float maxSpeed = 1.1f;
+	public float drag = 0.4f;
 	public float mass = 1f;
 	public float armor = 1f;
 

core/src/io/anuke/mindustry/world/blocks/production/MechFactory.java

@@ -17,7 +17,6 @@ import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.ucore.core.Effects;
 import io.anuke.ucore.core.Graphics;
-import io.anuke.ucore.core.Timers;
 import io.anuke.ucore.graphics.Draw;
 import io.anuke.ucore.graphics.Lines;
 import io.anuke.ucore.util.Mathf;
@@ -29,13 +28,10 @@ import java.io.IOException;
 import static io.anuke.mindustry.Vars.tilesize;
 
 public class MechFactory extends Block{
-    protected float powerUse = 0.1f;
     protected Mech mech;
 
     public MechFactory(String name){
         super(name);
-        hasItems = true;
-        hasPower = true;
         update = true;
         consumesTap = true;
         solidifes = true;
@@ -90,8 +86,6 @@ public class MechFactory extends Block{
     public void update(Tile tile) {
         MechFactoryEntity entity = tile.entity();
 
-        float used = Math.min(powerCapacity, Timers.delta() * powerUse);
-
         if(entity.open){
             if(!Units.anyEntities(tile)){
                 entity.open = false;
@@ -101,13 +95,9 @@ public class MechFactory extends Block{
         }
 
         if(entity.player != null){
-            if(entity.power.amount >= used || true) {
-                entity.heat = Mathf.lerpDelta(entity.heat, 1f, 0.1f);
-                entity.progress += 1f / Vars.respawnduration;
-                entity.power.amount -= used;
-            }else{
-                entity.heat = Mathf.lerpDelta(entity.heat, 0f, 0.05f);
-            }
+            entity.heat = Mathf.lerpDelta(entity.heat, 1f, 0.1f);
+            entity.progress += 1f / Vars.respawnduration;
+
 
             entity.time += entity.heat;