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

More unit progress

Browse Source
This commit is contained in:
Anuken
2020-07-10 20:04:45 -04:00
parent d7e432f730
commit 9cb4645b11
30 changed files with 106 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -603,7 +603,7 @@ public class DesktopInput extends InputHandler{
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 * 1.1f, u -> u.isAI() && u.isGrounded());
Unit target = Units.closest(player.team(), pay.x(), pay.y(), unit.type().hitsize * 1.1f, u -> u.isAI() && u.isGrounded() && u.mass() < unit.mass());
if(target != null){
Call.pickupUnitPayload(player, target);
}else if(!pay.hasPayload()){

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

@@ -112,6 +112,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
Payloadc pay = (Payloadc)unit;
if(target.isAI() && target.isGrounded() && pay.payloads().size < unit.type().payloadCapacity
&& target.mass() < unit.mass()
&& target.within(unit, unit.type().hitsize * 1.5f)){
pay.pickup(target);
}