Implemented conveyor physics

core/assets/version.properties

@@ -1,7 +1,7 @@
 #Autogenerated file. Do not modify.
-#Sun Apr 08 10:46:09 EDT 2018
+#Sun Apr 08 12:00:18 EDT 2018
 version=release
-androidBuildCode=872
+androidBuildCode=873
 name=Mindustry
 code=3.5
 build=custom build

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

@@ -118,8 +118,9 @@ public class Blocks {
         drops = new ItemStack(Items.sand, 1);
     }},
 
-    ice = new Floor("ice") {
+    ice = new Floor("ice") {{
-    },
+        dragMultiplier = 0.2f;
+    }},
 
     snow = new Floor("snow") {
     },

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

@@ -47,6 +47,7 @@ public abstract class Unit extends SyncEntity {
 
     public void updateVelocityStatus(float drag, float maxVelocity){
         Floor floor = getFloorOn();
+        Tile tile = world.tileWorld(x, y);
 
         velocity.limit(maxVelocity);
 
@@ -56,7 +57,16 @@ public abstract class Unit extends SyncEntity {
             x += velocity.x / getMass();
             y += velocity.y / getMass();
         }else{
-            if(floor.liquid && velocity.len() > 0.4f && Timers.get(this, "flooreffect", 14 - (velocity.len() * floor.speedMultiplier)*2f)){
+            boolean onLiquid = floor.liquid;
+
+            if(tile != null){
+                tile.block().unitOn(tile, this);
+                if(tile.block() != Blocks.air){
+                    onLiquid = false;
+                }
+            }
+
+            if(onLiquid && velocity.len() > 0.4f && Timers.get(this, "flooreffect", 14 - (velocity.len() * floor.speedMultiplier)*2f)){
                 Effects.effect(floor.walkEffect, floor.liquidColor, x, y);
             }
 
@@ -66,7 +76,7 @@ public abstract class Unit extends SyncEntity {
                 damagePeriodic(floor.damageTaken);
             }
 
-            if(floor.drownTime > 0){
+            if(onLiquid && floor.drownTime > 0){
                 drownTime += Timers.delta() * 1f/floor.drownTime;
                 if(Timers.get(this, "drowneffect", 15)){
                     Effects.effect(floor.drownUpdateEffect, floor.liquidColor, x, y);

core/src/io/anuke/mindustry/world/Block.java

@@ -7,6 +7,7 @@ import com.badlogic.gdx.utils.ObjectMap;
 import com.badlogic.gdx.utils.reflect.ClassReflection;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.entities.TileEntity;
+import io.anuke.mindustry.entities.Unit;
 import io.anuke.mindustry.graphics.DrawLayer;
 import io.anuke.mindustry.graphics.Layer;
 import io.anuke.mindustry.content.fx.ExplosionFx;
@@ -122,6 +123,8 @@ public class Block extends BaseBlock {
 	public void drawSelect(Tile tile){}
 	public void drawPlace(int x, int y, int rotation, boolean valid){}
 	public void placed(Tile tile){}
+	public void unitOn(Tile tile, Unit unit){}
+
 	/**Called after all blocks are created.*/
 	public void init(){
 		setStats();

core/src/io/anuke/mindustry/world/blocks/types/distribution/Conveyor.java

@@ -2,6 +2,7 @@ package io.anuke.mindustry.world.blocks.types.distribution;
 
 import com.badlogic.gdx.utils.LongArray;
 import io.anuke.mindustry.entities.TileEntity;
+import io.anuke.mindustry.entities.Unit;
 import io.anuke.mindustry.resource.Item;
 import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.world.Block;
@@ -33,7 +34,8 @@ public class Conveyor extends Block{
 	private final Translator tr1 = new Translator();
 	private final Translator tr2 = new Translator();
 
-	public float speed = 0f;
+	protected float speed = 0f;
+	protected float carryCapacity = 8f;
 
 	protected Conveyor(String name) {
 		super(name);
@@ -90,6 +92,26 @@ public class Conveyor extends Block{
 		}
 	}
 
+	@Override
+	public void unitOn(Tile tile, Unit unit) {
+		ConveyorEntity entity = tile.entity();
+
+		float angle = tile.getRotation() * 90f;
+		float speed = this.speed * tilesize / 1.5f;
+		float tx = Angles.trnsx(angle, 1f), ty = Angles.trnsy(angle, 1f);
+		unit.velocity.add(tx * speed * Timers.delta(), ty * speed * Timers.delta());
+
+		if(Math.abs(tx) > Math.abs(ty)){
+			float rx = tile.worldx() + tx/2f*tilesize;
+			entity.minCarry = Math.min(entity.minCarry, Mathf.clamp((entity.x - rx) * tx / tilesize));
+		}else{
+			float ry = tile.worldy() + ty/2f*tilesize;
+			entity.minCarry = Math.min(entity.minCarry, Mathf.clamp((entity.y - ry) * ty / tilesize));
+		}
+
+		entity.carrying += unit.getMass();
+	}
+
 	@Override
 	public void update(Tile tile){
 
@@ -97,6 +119,7 @@ public class Conveyor extends Block{
 		entity.minitem = 1f;
 
 		int minremove = Integer.MAX_VALUE;
+		float speed = Math.max(this.speed - (1f - (carryCapacity - entity.carrying)/carryCapacity), 0f);
 
 		for(int i = entity.convey.size - 1; i >= 0; i --){
 			long value = entity.convey.get(i);
@@ -109,6 +132,9 @@ public class Conveyor extends Block{
 			}
 
 			float nextpos = (i == entity.convey.size - 1 ? 100f : pos2.set(entity.convey.get(i + 1), ItemPos.updateShorts).y) - itemSpace;
+			if(entity.minCarry >= pos.y && entity.minCarry <= nextpos){
+				nextpos = entity.minCarry;
+			}
 			float maxmove = Math.min(nextpos - pos.y, speed * Timers.delta());
 
 			if(maxmove > minmove){
@@ -131,6 +157,9 @@ public class Conveyor extends Block{
 			}
 		}
 
+		entity.carrying = 0f;
+		entity.minCarry = 2f;
+
 		if(minremove != Integer.MAX_VALUE) entity.convey.truncate(minremove);
 	}
 
@@ -175,18 +204,12 @@ public class Conveyor extends Block{
 		}
 	}
 
-	/**
-	 * Conveyor data format:
-	 * [0] item ordinal
-	 * [1] x: byte ranging from -128 to 127, scaled should be at [-1, 1], corresponds to relative X from the conveyor middle
-	 * [2] y: byte ranging from -128 to 127, scaled should be at [0, 1], corresponds to relative Y from the conveyor start
-	 * [3] seed: -128 to 127, unscaled
-	 * Size is 4 bytes, or one int.
-	 */
 	public static class ConveyorEntity extends TileEntity{
 
 		LongArray convey = new LongArray();
 		float minitem = 1;
+		float carrying;
+		float minCarry = 2f;
 
 		@Override
 		public void write(DataOutputStream stream) throws IOException{