Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed player build indicators, power void

Browse Source
This commit is contained in:
Anuken
2018-10-17 10:31:59 -04:00
parent 8e952a550b
commit 02286b0c4e
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java
View File

@@ -16,6 +16,7 @@ import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.PowerBlock; import io.anuke.mindustry.world.blocks.PowerBlock;
import io.anuke.mindustry.world.blocks.distribution.Sorter; import io.anuke.mindustry.world.blocks.distribution.Sorter;
import io.anuke.mindustry.world.blocks.power.PowerNode; import io.anuke.mindustry.world.blocks.power.PowerNode;
import io.anuke.mindustry.world.meta.BlockStat;
import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.scene.ui.ButtonGroup; import io.anuke.ucore.scene.ui.ButtonGroup;
import io.anuke.ucore.scene.ui.ImageButton; import io.anuke.ucore.scene.ui.ImageButton;
@@ -48,6 +49,12 @@ public class DebugBlocks extends BlockList implements ContentList{
super.setBars(); super.setBars();
bars.remove(BarType.power); bars.remove(BarType.power);
} }
@Override
public void init(){
super.init();
stats.remove(BlockStat.powerCapacity);
}
}; };
powerInfinite = new PowerNode("powerinfinite"){ powerInfinite = new PowerNode("powerinfinite"){

2
core/src/io/anuke/mindustry/entities/Player.java
View File

@@ -428,7 +428,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
Draw.color(Palette.removeBack); Draw.color(Palette.removeBack);
float rad = Mathf.absin(Timers.time(), 7f, 1f) + block.size * tilesize / 2f; float rad = Mathf.absin(Timers.time(), 7f, 1f) + block.size * tilesize / 2f - 1;
Lines.square( Lines.square(
request.x * tilesize + block.offset(), request.x * tilesize + block.offset(),

4
core/src/io/anuke/mindustry/input/DesktopInput.java
View File

@@ -101,9 +101,9 @@ public class DesktopInput extends InputHandler{
tile = tile.target(); tile = tile.target();
Draw.color(Palette.removeBack); Draw.color(Palette.removeBack);
Lines.square(tile.drawx(), tile.drawy()-1, tile.block().size * tilesize / 2f); Lines.square(tile.drawx(), tile.drawy()-1, tile.block().size * tilesize / 2f - 1);
Draw.color(Palette.remove); Draw.color(Palette.remove);
Lines.square(tile.drawx(), tile.drawy(), tile.block().size * tilesize / 2f); Lines.square(tile.drawx(), tile.drawy(), tile.block().size * tilesize / 2f - 1);
} }
} }