Fixed tops of some generator blocks
After Width: | Height: | Size: 9.1 KiB |
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 8.9 KiB |
After Width: | Height: | Size: 6.2 KiB |
Before Width: | Height: | Size: 1.0 MiB After Width: | Height: | Size: 1019 KiB |
Before Width: | Height: | Size: 97 KiB After Width: | Height: | Size: 112 KiB |
Before Width: | Height: | Size: 254 KiB After Width: | Height: | Size: 254 KiB |
Before Width: | Height: | Size: 140 KiB After Width: | Height: | Size: 143 KiB |
Before Width: | Height: | Size: 234 KiB After Width: | Height: | Size: 236 KiB |
Before Width: | Height: | Size: 288 KiB After Width: | Height: | Size: 277 KiB |
Before Width: | Height: | Size: 377 KiB After Width: | Height: | Size: 374 KiB |
@ -36,7 +36,7 @@ public class ItemLiquidGenerator extends PowerGenerator{
|
||||
protected Effects.Effect generateEffect = Fx.generatespark;
|
||||
protected Effects.Effect explodeEffect = Fx.generatespark;
|
||||
protected Color heatColor = Color.valueOf("ff9b59");
|
||||
protected TextureRegion topRegion;
|
||||
protected TextureRegion topRegion, liquidRegion;
|
||||
protected boolean randomlyExplode = false;
|
||||
|
||||
public ItemLiquidGenerator(boolean hasItems, boolean hasLiquids, String name){
|
||||
@ -59,6 +59,7 @@ public class ItemLiquidGenerator extends PowerGenerator{
|
||||
if(hasItems){
|
||||
topRegion = Core.atlas.find(name + "-top");
|
||||
}
|
||||
liquidRegion = Core.atlas.find(name + "-liquid");
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -151,15 +152,11 @@ public class ItemLiquidGenerator extends PowerGenerator{
|
||||
if(hasLiquids){
|
||||
Draw.color(entity.liquids.current().color);
|
||||
Draw.alpha(entity.liquids.currentAmount() / liquidCapacity);
|
||||
drawLiquidCenter(tile);
|
||||
Draw.rect(liquidRegion, tile.drawx(), tile.drawy());
|
||||
Draw.color();
|
||||
}
|
||||
}
|
||||
|
||||
public void drawLiquidCenter(Tile tile){
|
||||
Draw.rect("blank", tile.drawx(), tile.drawy(), 2, 2);
|
||||
}
|
||||
|
||||
protected float getItemEfficiency(Item item){
|
||||
return 0.0f;
|
||||
}
|
||||
|
@ -2,8 +2,7 @@ package io.anuke.mindustry.world.blocks.power;
|
||||
|
||||
import io.anuke.arc.Core;
|
||||
import io.anuke.arc.graphics.Color;
|
||||
import io.anuke.arc.graphics.g2d.Draw;
|
||||
import io.anuke.arc.graphics.g2d.TextureRegion;
|
||||
import io.anuke.arc.graphics.g2d.*;
|
||||
import io.anuke.arc.math.Mathf;
|
||||
import io.anuke.arc.math.geom.Vector2;
|
||||
import io.anuke.arc.util.Time;
|
||||
@ -155,7 +154,7 @@ public class NuclearReactor extends PowerGenerator{
|
||||
NuclearReactorEntity entity = tile.entity();
|
||||
|
||||
Draw.color(coolColor, hotColor, entity.heat);
|
||||
Draw.rect("white", tile.drawx(), tile.drawy(), size * tilesize, size * tilesize);
|
||||
Fill.rect(tile.drawx(), tile.drawy(), size * tilesize, size * tilesize);
|
||||
|
||||
Draw.color(entity.liquids.current().color);
|
||||
Draw.alpha(entity.liquids.currentAmount() / liquidCapacity);
|
||||
|
@ -303,7 +303,7 @@ task pack(){
|
||||
|
||||
//antialias everything except UI elements (...for some reason)
|
||||
fileTree(dir: '../core/assets-raw/sprites_out/', include: "**/*.png").visit{ file ->
|
||||
if(file.isDirectory() || (file.toString().replace("\\", "/").contains("/ui/") && !file.toString().replace("\\", "/").contains("/icons/"))) return
|
||||
if(file.isDirectory() || (file.toString().replace("\\", "/").contains("/ui/"))) return
|
||||
|
||||
antialias(file.file)
|
||||
}
|
||||
|