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

Disable naval units on ground / Mobile payload input

Browse Source
This commit is contained in:
Anuken
2020-08-17 16:15:51 -04:00
parent 9a48028508
commit 7ecf5aa26d
11 changed files with 83 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,6 @@ import arc.scene.ui.layout.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import mindustry.*;
import mindustry.entities.*;
import mindustry.entities.units.*;
import mindustry.game.EventType.*;
import mindustry.game.*;
@@ -619,22 +618,12 @@ public class DesktopInput extends InputHandler{
if(unit instanceof Payloadc){
Payloadc pay = (Payloadc)unit;
if(Core.input.keyTap(Binding.pickupCargo) && pay.payloads().size < unit.type().payloadCapacity){
Unit target = Units.closest(player.team(), pay.x(), pay.y(), unit.type().hitsize * 2.5f, u -> u.isAI() && u.isGrounded() && u.mass() < unit.mass() && u.within(unit, u.hitSize + unit.hitSize * 1.2f));
if(target != null){
Call.pickupUnitPayload(player, target);
}else if(!pay.hasPayload()){
Building tile = world.buildWorld(pay.x(), pay.y());
if(tile != null && tile.team == unit.team){
Call.pickupBlockPayload(player, tile);
}
}
if(Core.input.keyTap(Binding.pickupCargo)){
tryPickupPayload();
}
if(Core.input.keyTap(Binding.dropCargo)){
Call.dropPayload(player, player.x, player.y);
pay.dropLastPayload();
tryDropPayload();
}
}

36
core/src/mindustry/input/InputHandler.java
View File

@@ -238,7 +238,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
}else if(unit == null){ //just clear the unit (is this used?)
player.clearUnit();
//make sure it's AI controlled, so players can't overwrite each other
}else if(unit.isAI() && unit.team == player.team() && !unit.deactivated){
}else if(unit.isAI() && unit.team == player.team() && !unit.deactivated()){
player.unit(unit);
Time.run(Fx.unitSpirit.lifetime, () -> Fx.unitControl.at(unit.x, unit.y, 0f, unit));
if(!player.dead()){
@@ -315,7 +315,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
}
if(controlledType != null && player.dead()){
Unit unit = Units.closest(player.team(), player.x, player.y, u -> !u.isPlayer() && u.type() == controlledType && !u.deactivated);
Unit unit = Units.closest(player.team(), player.x, player.y, u -> !u.isPlayer() && u.type() == controlledType && !u.deactivated());
if(unit != null){
Call.unitControl(player, unit);
@@ -325,7 +325,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
public void checkUnit(){
if(controlledType != null){
Unit unit = Units.closest(player.team(), player.x, player.y, u -> !u.isPlayer() && u.type() == controlledType && !u.deactivated);
Unit unit = Units.closest(player.team(), player.x, player.y, u -> !u.isPlayer() && u.type() == controlledType && !u.deactivated());
if(unit == null && controlledType == UnitTypes.block){
unit = world.buildWorld(player.x, player.y) instanceof ControlBlock ? ((ControlBlock)world.buildWorld(player.x, player.y)).unit() : null;
}
@@ -340,6 +340,34 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
}
}
public void tryPickupPayload(){
Unit unit = player.unit();
if(!(unit instanceof Payloadc)) return;
Payloadc pay = (Payloadc)unit;
if(pay.payloads().size >= unit.type().payloadCapacity) return;
Unit target = Units.closest(player.team(), pay.x(), pay.y(), unit.type().hitsize * 2.5f, u -> u.isAI() && u.isGrounded() && u.mass() < unit.mass() && u.within(unit, u.hitSize + unit.hitSize * 1.2f));
if(target != null){
Call.pickupUnitPayload(player, target);
}else if(!pay.hasPayload()){
Building tile = world.buildWorld(pay.x(), pay.y());
if(tile != null && tile.team == unit.team){
Call.pickupBlockPayload(player, tile);
}
}
}
public void tryDropPayload(){
Unit unit = player.unit();
if(!(unit instanceof Payloadc)) return;
Payloadc pay = (Payloadc)unit;
Call.dropPayload(player, player.x, player.y);
pay.dropLastPayload();
}
public float getMouseX(){
return Core.input.mouseX();
}
@@ -848,7 +876,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
}
public @Nullable Unit selectedUnit(){
Unit unit = Units.closest(player.team(), Core.input.mouseWorld().x, Core.input.mouseWorld().y, 40f, u -> u.isAI() && !u.deactivated);
Unit unit = Units.closest(player.team(), Core.input.mouseWorld().x, Core.input.mouseWorld().y, 40f, u -> u.isAI() && !u.deactivated());
if(unit != null){
unit.hitbox(Tmp.r1);
Tmp.r1.grow(6f);

15
core/src/mindustry/input/MobileInput.java
View File

@@ -572,9 +572,18 @@ public class MobileInput extends InputHandler implements GestureListener{
}
//apply command on double tap
if(count == 2 && Mathf.within(worldx, worldy, player.unit().x, player.unit().y, player.unit().hitSize * 2f) &&
player.unit() instanceof Commanderc){
Call.unitCommand(player);
if(count == 2 && Mathf.within(worldx, worldy, player.unit().x, player.unit().y, player.unit().hitSize * 2f)){
if(player.unit() instanceof Commanderc){
Call.unitCommand(player);
}
if(player.unit() instanceof Payloadc){
if(((Payloadc)player.unit()).hasPayload()){
tryDropPayload();
}else{
tryPickupPayload();
}
}
}
}