diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java index 85108d32c1..3e979836e9 100644 --- a/core/src/io/anuke/mindustry/entities/Player.java +++ b/core/src/io/anuke/mindustry/entities/Player.java @@ -448,7 +448,6 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra Lines.stroke(2f, Palette.removeBack); float rad = Mathf.absin(Time.time(), 7f, 1f) + block.size * tilesize / 2f - 1; - Lines.square( request.x * tilesize + block.offset(), request.y * tilesize + block.offset() - 1, @@ -461,16 +460,23 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra request.y * tilesize + block.offset(), rad); }else{ - //draw place request - Lines.stroke(2f, Palette.accentBack); + float rad = Mathf.absin(Time.time(), 7f, 1f) - 1.5f + request.recipe.result.size * tilesize / 2f; - 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( request.x * tilesize + request.recipe.result.offset(), request.y * tilesize + request.recipe.result.offset() - 1, 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); Lines.square( diff --git a/core/src/io/anuke/mindustry/game/GlobalData.java b/core/src/io/anuke/mindustry/game/GlobalData.java index 98408b074b..2b7c8f05f5 100644 --- a/core/src/io/anuke/mindustry/game/GlobalData.java +++ b/core/src/io/anuke/mindustry/game/GlobalData.java @@ -95,7 +95,7 @@ public class GlobalData{ //set up default values if(!Core.settings.has("item-" + Items.copper)){ - // addItem(Items.copper, 1000); + addItem(Items.copper, 1000); } } diff --git a/core/src/io/anuke/mindustry/input/DesktopInput.java b/core/src/io/anuke/mindustry/input/DesktopInput.java index 3d626f301d..3d426750f7 100644 --- a/core/src/io/anuke/mindustry/input/DesktopInput.java +++ b/core/src/io/anuke/mindustry/input/DesktopInput.java @@ -182,7 +182,7 @@ public class DesktopInput extends InputHandler{ 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());