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

Fixed #10686

Browse Source
This commit is contained in:
Anuken
2025-04-19 11:08:51 -04:00
parent b07acb3ce1
commit dc9d7d1b87
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/src/mindustry/input/DesktopInput.java
View File

@@ -43,7 +43,7 @@ public class DesktopInput extends InputHandler{
/** Selected build plan for movement. */ /** Selected build plan for movement. */
public @Nullable BuildPlan splan; public @Nullable BuildPlan splan;
/** Whether player is currently deleting removal plans. */ /** Whether player is currently deleting removal plans. */
public boolean deleting = false, shouldShoot = false, panning = false; public boolean deleting = false, shouldShoot = false, panning = false, movedPlan = false;
/** Mouse pan speed. */ /** Mouse pan speed. */
public float panScale = 0.005f, panSpeed = 4.5f, panBoostSpeed = 15f; public float panScale = 0.005f, panSpeed = 4.5f, panBoostSpeed = 15f;
/** Delta time between consecutive clicks. */ /** Delta time between consecutive clicks. */
@@ -643,10 +643,13 @@ public class DesktopInput extends InputHandler{
} }
if(splan != null){ if(splan != null){
float x = Core.input.mouseWorld().x + buildPlanMouseOffsetX; int x = Math.round((Core.input.mouseWorld().x + buildPlanMouseOffsetX) / tilesize);
float y = Core.input.mouseWorld().y + buildPlanMouseOffsetY; int y = Math.round((Core.input.mouseWorld().y + buildPlanMouseOffsetY) / tilesize);
splan.x = Math.round(x / tilesize); if(splan.x != x || splan.y != y){
splan.y = Math.round(y / tilesize); splan.x = x;
splan.y = y;
movedPlan = true;
}
} }
if(block == null || mode != placing){ if(block == null || mode != placing){
@@ -673,11 +676,10 @@ public class DesktopInput extends InputHandler{
selectUnitsRect(); selectUnitsRect();
} }
if(Core.input.keyTap(Binding.select) && !Core.scene.hasMouse()){ if(Core.input.keyRelease(Binding.select) && !Core.scene.hasMouse()){
tappedOne = false;
BuildPlan plan = getPlan(cursorX, cursorY); BuildPlan plan = getPlan(cursorX, cursorY);
if(plan != null){ if(plan != null && !movedPlan){
//move selected to front //move selected to front
int index = player.unit().plans.indexOf(plan, true); int index = player.unit().plans.indexOf(plan, true);
if(index != -1){ if(index != -1){
@@ -685,6 +687,11 @@ public class DesktopInput extends InputHandler{
player.unit().plans.addFirst(plan); player.unit().plans.addFirst(plan);
} }
} }
}
if(Core.input.keyTap(Binding.select) && !Core.scene.hasMouse()){
tappedOne = false;
BuildPlan plan = getPlan(cursorX, cursorY);
if(Core.input.keyDown(Binding.break_block)){ if(Core.input.keyDown(Binding.break_block)){
mode = none; mode = none;
@@ -699,6 +706,7 @@ public class DesktopInput extends InputHandler{
updateLine(selectX, selectY); updateLine(selectX, selectY);
}else if(plan != null && !plan.breaking && mode == none && !plan.initialized && plan.progress <= 0f){ }else if(plan != null && !plan.breaking && mode == none && !plan.initialized && plan.progress <= 0f){
splan = plan; splan = plan;
movedPlan = false;
buildPlanMouseOffsetX = splan.x * tilesize - Core.input.mouseWorld().x; buildPlanMouseOffsetX = splan.x * tilesize - Core.input.mouseWorld().x;
buildPlanMouseOffsetY = splan.y * tilesize - Core.input.mouseWorld().y; buildPlanMouseOffsetY = splan.y * tilesize - Core.input.mouseWorld().y;
}else if(plan != null && plan.breaking){ }else if(plan != null && plan.breaking){