Merge branch 'circle-physics' of https://github.com/Anuken/Mindustry

# Conflicts:
#	core/src/io/anuke/mindustry/content/UnitTypes.java

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

@@ -42,10 +42,10 @@ public class Mechs implements ContentList{
             {
                 drillPower = 1;
                 mineSpeed = 1.5f;
+                mass = 1.2f;
                 speed = 0.5f;
                 boostSpeed = 0.85f;
                 weapon = Weapons.blaster;
-                maxSpeed = 4f;
                 trailColorTo = Color.valueOf("ffd37f");
                 armor = 20f;
             }
@@ -81,13 +81,13 @@ public class Mechs implements ContentList{
                 speed = 0.75f;
                 boostSpeed = 0.95f;
                 itemCapacity = 15;
+                mass = 0.9f;
                 armor = 30f;
                 weaponOffsetX = -1;
                 itemCapacity = 15;
                 weaponOffsetY = -1;
                 weapon = Weapons.shockgun;
                 trailColorTo = Color.valueOf("d3ddff");
-                maxSpeed = 5f;
             }
 
             @Override
@@ -115,11 +115,11 @@ public class Mechs implements ContentList{
                 itemCapacity = 70;
                 weaponOffsetY = -1;
                 weaponOffsetX = 1;
+                mass = 1.75f;
                 speed = 0.44f;
                 drag = 0.35f;
                 boostSpeed = 0.8f;
                 weapon = Weapons.healBlaster;
-                maxSpeed = 5f;
                 armor = 15f;
                 trailColorTo = Palette.heal;
             }
@@ -157,12 +157,12 @@ public class Mechs implements ContentList{
                 itemCapacity = 50;
                 speed = 0.36f;
                 boostSpeed = 0.6f;
+                mass = 4f;
                 shake = 4f;
                 weaponOffsetX = 1;
                 weaponOffsetY = 0;
                 weapon = Weapons.swarmer;
                 trailColorTo = Color.valueOf("feb380");
-                maxSpeed = 3.5f;
                 armor = 45f;
             }
 
@@ -214,7 +214,6 @@ public class Mechs implements ContentList{
             drillPower = 1;
             mineSpeed = 0.9f;
             speed = 0.4f;
-            maxSpeed = 10f;
             drag = 0.1f;
             armor = 10f;
             weapon = Weapons.blasterSmall;
@@ -231,8 +230,8 @@ public class Mechs implements ContentList{
             {
                 drillPower = -1;
                 speed = 0.11f;
-                maxSpeed = 10f;
                 drag = 0.01f;
+                mass = 2f;
                 armor = 5f;
                 weapon = Weapons.missiles;
                 trailColor = Color.valueOf("d3ddff");
@@ -285,8 +284,8 @@ public class Mechs implements ContentList{
             {
                 drillPower = 2;
                 speed = 0.12f;
-                maxSpeed = 10f;
                 drag = 0.035f;
+                mass = 2.5f;
                 turnCursor = false;
                 armor = 20f;
                 itemCapacity = 30;
@@ -307,8 +306,8 @@ public class Mechs implements ContentList{
                 drillPower = 4;
                 mineSpeed = 1.3f;
                 speed = 0.32f;
-                maxSpeed = 10f;
                 drag = 0.06f;
+                mass = 3f;
                 armor = 30f;
                 itemCapacity = 60;
                 trailColor = Color.valueOf("feb380");

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

@@ -24,6 +24,8 @@ public class UnitTypes implements ContentList{
                 maxVelocity = 1.7f;
                 range = 40f;
                 health = 45;
+                hitsize = 4f;
+                mass = 0.1f;
                 weapon = Weapons.droneBlaster;
                 trailColor = Color.valueOf("ffd37f");
             }
@@ -48,6 +50,8 @@ public class UnitTypes implements ContentList{
             maxVelocity = 1.1f;
             speed = 0.2f;
             drag = 0.4f;
+            hitsize = 8f;
+            mass = 1.75f;
             range = 40f;
             weapon = Weapons.chainBlaster;
             health = 130;
@@ -57,7 +61,9 @@ public class UnitTypes implements ContentList{
             maxVelocity = 0.8f;
             speed = 0.18f;
             drag = 0.4f;
+            mass = 3.5f;
             range = 10f;
+            hitsize = 9f;
             rotatespeed = 0.1f;
             weapon = Weapons.flamethrower;
             health = 440;
@@ -67,6 +73,8 @@ public class UnitTypes implements ContentList{
             maxVelocity = 0.8f;
             speed = 0.15f;
             drag = 0.4f;
+            mass = 5f;
+            hitsize = 10f;
             range = 10f;
             rotatespeed = 0.06f;
             weaponOffsetX = 1;
@@ -79,6 +87,7 @@ public class UnitTypes implements ContentList{
             speed = 0.3f;
             maxVelocity = 1.9f;
             drag = 0.01f;
+            mass = 1.5f;
             weapon = Weapons.chainBlaster;
             isFlying = true;
             health = 70;
@@ -88,6 +97,7 @@ public class UnitTypes implements ContentList{
             health = 250;
             speed = 0.2f;
             maxVelocity = 1.4f;
+            mass = 3f;
             drag = 0.01f;
             isFlying = true;
             targetAir = false;
@@ -96,10 +106,9 @@ public class UnitTypes implements ContentList{
 
         revenant = new UnitType("revenant", Revenant.class, Revenant::new){{
             health = 250;
-            mass = 4f;
-            speed = 0.14f*mass;
+            mass = 5f;
             hitsize = 12f;
-            maxVelocity = 1.4f;
+            speed = 0.14f;
             drag = 0.01f;
             isFlying = true;
             weapon = Weapons.laserBurster;
@@ -108,6 +117,7 @@ public class UnitTypes implements ContentList{
         phantom = new UnitType("phantom", Phantom.class, Phantom::new){{
             isFlying = true;
             drag = 0.01f;
+            mass = 2f;
             speed = 0.2f;
             maxVelocity = 0.9f;
             range = 70f;

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

@@ -190,8 +190,8 @@ public class TurretBlocks extends BlockList implements ContentList{
         cyclone = new ItemTurret("cyclone"){{
             ammoTypes = new AmmoType[]{AmmoTypes.flakExplosive, AmmoTypes.flakPlastic, AmmoTypes.flakSurge};
             xRand = 4f;
-            reload = 10f;
-            range = 140f;
+            reload = 8f;
+            range = 145f;
             size = 3;
             recoil = 3f;
             rotatespeed = 10f;