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

Better build request display / Fixed incorrect rotation axes

Browse Source
This commit is contained in:
Anuken
2019-01-18 11:30:15 -05:00
parent 7527f9326c
commit 2385011f96
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -448,7 +448,6 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
Lines.stroke(2f, Palette.removeBack); Lines.stroke(2f, Palette.removeBack);
float rad = Mathf.absin(Time.time(), 7f, 1f) + block.size * tilesize / 2f - 1; float rad = Mathf.absin(Time.time(), 7f, 1f) + block.size * tilesize / 2f - 1;
Lines.square( Lines.square(
request.x * tilesize + block.offset(), request.x * tilesize + block.offset(),
request.y * tilesize + block.offset() - 1, request.y * tilesize + block.offset() - 1,
@@ -461,16 +460,23 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
request.y * tilesize + block.offset(), request.y * tilesize + block.offset(),
rad); rad);
}else{ }else{
//draw place request float rad = Mathf.absin(Time.time(), 7f, 1f) - 1.5f + request.recipe.result.size * tilesize / 2f;
Lines.stroke(2f, Palette.accentBack);
float rad = Mathf.absin(Time.time(), 7f, 1f) - 2f + request.recipe.result.size * tilesize / 2f; //draw place request
Lines.stroke(1f, Palette.accentBack);
Lines.square( Lines.square(
request.x * tilesize + request.recipe.result.offset(), request.x * tilesize + request.recipe.result.offset(),
request.y * tilesize + request.recipe.result.offset() - 1, request.y * tilesize + request.recipe.result.offset() - 1,
rad); rad);
Draw.color();
Draw.rect(request.recipe.result.getEditorIcon(),
request.x * tilesize + request.recipe.result.offset(),
request.y * tilesize + request.recipe.result.offset(), rad*2, rad*2, request.rotation * 90);
Draw.color(Palette.accent); Draw.color(Palette.accent);
Lines.square( Lines.square(

2
core/src/io/anuke/mindustry/game/GlobalData.java
View File

@@ -95,7 +95,7 @@ public class GlobalData{
//set up default values //set up default values
if(!Core.settings.has("item-" + Items.copper)){ if(!Core.settings.has("item-" + Items.copper)){
// addItem(Items.copper, 1000); addItem(Items.copper, 1000);
} }
} }

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

@@ -182,7 +182,7 @@ public class DesktopInput extends InputHandler{
selectScale = 0f; selectScale = 0f;
} }
rotation = Mathf.mod(rotation + (int) Core.input.axis(Binding.rotate), 4); rotation = Mathf.mod(rotation + (int) Core.input.axisTap(Binding.rotate), 4);
Tile cursor = tileAt(Core.input.mouseX(), Core.input.mouseY()); Tile cursor = tileAt(Core.input.mouseX(), Core.input.mouseY());