Fixed power passback, adjusted laser colors to depend on transfer amount

core/assets/version.properties

@@ -1,5 +1,5 @@
 #Autogenerated file. Do not modify.
-#Sat Mar 24 00:50:32 EDT 2018
+#Sat Mar 24 11:10:41 EDT 2018
 version=release
 androidBuildCode=633
 name=Mindustry

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

@@ -48,7 +48,7 @@ public class ThreadHandler {
     }
 
     public long getFrameID(){
-        return frame;
+        return enabled ? frame : Gdx.graphics.getFrameId();
     }
 
     public float getFramesSinceUpdate(){

core/src/io/anuke/mindustry/world/blocks/BaseBlock.java

@@ -39,6 +39,7 @@ public abstract class BaseBlock {
         return true;
     }
 
+    /**Returns how much power is accepted.*/
     public float addPower(Tile tile, float amount){
         float canAccept = Math.min(powerCapacity - tile.entity.power.amount, amount);
 

core/src/io/anuke/mindustry/world/blocks/types/generation/PowerDistributor.java

@@ -13,22 +13,19 @@ import io.anuke.ucore.core.Timers;
 import io.anuke.ucore.graphics.Draw;
 import io.anuke.ucore.graphics.Lines;
 import io.anuke.ucore.graphics.Shapes;
-import io.anuke.ucore.util.Angles;
+import io.anuke.ucore.util.*;
-import io.anuke.ucore.util.Mathf;
-import io.anuke.ucore.util.Strings;
-import io.anuke.ucore.util.Translator;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
+import static io.anuke.mindustry.Vars.threads;
 import static io.anuke.mindustry.Vars.tilesize;
 import static io.anuke.mindustry.Vars.world;
 
 public class PowerDistributor extends PowerBlock{
 	public static final float thicknessScl = 0.7f;
-    public static final float flashScl = 0.07f;
+    public static final float flashScl = 0.12f;
-	public static final float laserMinValue = 0f;
 	public static final Color laserFrom = Color.valueOf("e3e3e3");
 	public static final Color laserTo = Color.valueOf("ffe7a8");
 
@@ -46,7 +43,7 @@ public class PowerDistributor extends PowerBlock{
 		expanded = true;
 		layer = Layer.power;
 		hasInventory = false;
-		powerCapacity = 1f;
+		powerCapacity = 5f;
 	}
 
 	@Override
@@ -159,11 +156,7 @@ public class PowerDistributor extends PowerBlock{
 
 		DistributorEntity entity = tile.entity();
 
-		if(entity.power.amount > powerSpeed){
+		entity.laserColor = Mathf.lerpDelta(entity.laserColor, Mathf.clamp(entity.powerRecieved/(powerSpeed)), 0.08f);
-			entity.laserColor = Mathf.lerpDelta(entity.laserColor, 1f, 0.05f);
-		}else{
-			entity.laserColor = Mathf.lerpDelta(entity.laserColor, laserMinValue, 0.05f);
-		}
 
 		Draw.color(laserFrom, laserTo, entity.laserColor * (1f-flashScl) + Mathf.sin(Timers.time(), 1.7f, flashScl));
 
@@ -175,22 +168,50 @@ public class PowerDistributor extends PowerBlock{
 		Draw.color();
 	}
 
+	@Override
+	public float addPower(Tile tile, float amount){
+		DistributorEntity entity = tile.entity();
+
+		if(entity.lastRecieved != threads.getFrameID()){
+			entity.lastRecieved = threads.getFrameID();
+			entity.powerRecieved = 0f;
+		}
+
+		float added = super.addPower(tile, amount);
+		entity.powerRecieved += added;
+		return added;
+	}
+
+	protected boolean shouldDistribute(Tile tile, Tile other){
+		if(other.block() instanceof PowerDistributor){
+			return other.entity.power.amount / other.block().powerCapacity <
+					tile.entity.power.amount / powerCapacity;
+		}
+		return true;
+	}
+
 	protected void distributeLaserPower(Tile tile){
 		DistributorEntity entity = tile.entity();
 
+		int targets = 0;
+
 		//validate everything first.
 		for(int i = 0; i < entity.links.size; i ++){
 			Tile target = world.tile(entity.links.get(i));
 			if(!linkValid(tile, target)) {
 				entity.links.removeIndex(i);
 				i --;
+			}else if(shouldDistribute(tile, target)){
+				targets ++;
 			}
 		}
 
-		float result = Math.min(entity.power.amount / entity.links.size, powerSpeed * Timers.delta());
+		float result = Math.min(entity.power.amount / targets, powerSpeed * Timers.delta());
 
 		for(int i = 0; i < entity.links.size; i ++){
 			Tile target = world.tile(entity.links.get(i));
+			if(!shouldDistribute(tile, target)) continue;
+
 			float transmit = Math.min(result * Timers.delta(), entity.power.amount);
 			if(target.block().acceptPower(target, tile, transmit)){
 				entity.power.amount -= target.block().addPower(target, transmit);
@@ -261,7 +282,9 @@ public class PowerDistributor extends PowerBlock{
     }
 
     public static class DistributorEntity extends TileEntity{
-        public float laserColor = laserMinValue;
+        public float laserColor = 0f;
+        public float powerRecieved = 0f;
+        public long lastRecieved = 0;
         public IntArray links = new IntArray();
 
 		@Override

core/src/io/anuke/mindustry/world/blocks/types/generation/PowerGenerator.java

@@ -22,7 +22,8 @@ public class PowerGenerator extends PowerBlock {
 
         for(GridPoint2 point : Edges.getEdges(size)){
             Tile target = tile.getNearby(point);
-            if(target != null && target.block().hasPower) sources ++;
+            if(target != null && target.block().hasPower &&
+                    shouldDistribute(tile, target)) sources ++;
         }
 
         if(sources == 0) return;
@@ -34,7 +35,7 @@ public class PowerGenerator extends PowerBlock {
             if(target == null) continue;
             target = target.target();
 
-            if(target.block().hasPower){
+            if(target.block().hasPower && shouldDistribute(tile, target)){
                 float transmit = Math.min(result * Timers.delta(), entity.power.amount);
                 if(target.block().acceptPower(target, tile, transmit)){
                     entity.power.amount -= target.block().addPower(target, transmit);
@@ -43,6 +44,14 @@ public class PowerGenerator extends PowerBlock {
         }
     }
 
+    protected boolean shouldDistribute(Tile tile, Tile other){
+        if(other.block() instanceof PowerGenerator){
+            return other.entity.power.amount / other.block().powerCapacity <
+                    tile.entity.power.amount / powerCapacity;
+        }
+        return true;
+    }
+
     @Override
     public void update(Tile tile) {
         distributePower(tile);