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

More logic commands

Browse Source
This commit is contained in:
Anuken
2020-10-06 16:27:02 -04:00
parent 2d539565c3
commit 79bd9f1f81
9 changed files with 94 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,7 +159,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
if(target.isAI() && target.isGrounded() && pay.canPickup(target)
&& target.within(unit, unit.type().hitSize * 2f + target.type().hitSize * 2f)){
Call.pickedUnitPayload(player, target);
Call.pickedUnitPayload(unit, target);
}
}
@@ -174,57 +174,49 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
&& unit.within(tile, tilesize * tile.block.size * 1.2f + tilesize * 5f)){
//pick up block directly
if(tile.block.buildVisibility != BuildVisibility.hidden && tile.canPickup() && pay.canPickup(tile)){
Call.pickedBlockPayload(player, tile, true);
Call.pickedBlockPayload(unit, tile, true);
}else{ //pick up block payload
Payload current = tile.getPayload();
if(current != null && pay.canPickupPayload(current)){
Call.pickedBlockPayload(player, tile, false);
Call.pickedBlockPayload(unit, tile, false);
}
}
}
}
@Remote(targets = Loc.server, called = Loc.server)
public static void pickedUnitPayload(Player player, Unit target){
if(player == null || target == null || !(player.unit() instanceof Payloadc)){
if(target != null){
target.remove();
}
return;
public static void pickedUnitPayload(Unit unit, Unit target){
if(target != null && unit instanceof Payloadc pay){
pay.pickup(target);
}else if(target != null){
target.remove();
}
((Payloadc)player.unit()).pickup(target);
}
@Remote(targets = Loc.server, called = Loc.server)
public static void pickedBlockPayload(Player player, Building tile, boolean onGround){
if(player == null || tile == null || !(player.unit() instanceof Payloadc)){
if(tile != null && onGround){
Fx.unitPickup.at(tile);
tile.tile.remove();
}
return;
}
Unit unit = player.unit();
Payloadc pay = (Payloadc)unit;
if(onGround){
if(tile.block.buildVisibility != BuildVisibility.hidden && tile.canPickup() && pay.canPickup(tile)){
pay.pickup(tile);
}else{
Fx.unitPickup.at(tile);
tile.tile.remove();
}
}else{
Payload current = tile.getPayload();
if(current != null && pay.canPickupPayload(current)){
Payload taken = tile.takePayload();
if(taken != null){
pay.addPayload(taken);
public static void pickedBlockPayload(Unit unit, Building tile, boolean onGround){
if(tile != null && unit instanceof Payloadc pay){
if(onGround){
if(tile.block.buildVisibility != BuildVisibility.hidden && tile.canPickup() && pay.canPickup(tile)){
pay.pickup(tile);
}else{
Fx.unitPickup.at(tile);
tile.tile.remove();
}
}else{
Payload current = tile.getPayload();
if(current != null && pay.canPickupPayload(current)){
Payload taken = tile.takePayload();
if(taken != null){
pay.addPayload(taken);
Fx.unitPickup.at(tile);
}
}
}
}else if(tile != null && onGround){
Fx.unitPickup.at(tile);
tile.tile.remove();
}
}
@@ -238,19 +230,17 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
Tmp.v1.set(x, y).sub(pay).limit(tilesize * 4f).add(pay);
float cx = Tmp.v1.x, cy = Tmp.v1.y;
Call.payloadDropped(player, cx, cy);
Call.payloadDropped(player.unit(), cx, cy);
}
@Remote(called = Loc.server, targets = Loc.server)
public static void payloadDropped(Player player, float x, float y){
if(player == null) return;
Payloadc pay = (Payloadc)player.unit();
float prevx = pay.x(), prevy = pay.y();
pay.set(x, y);
pay.dropLastPayload();
pay.set(prevx, prevy);
public static void payloadDropped(Unit unit, float x, float y){
if(unit instanceof Payloadc pay){
float prevx = pay.x(), prevy = pay.y();
pay.set(x, y);
pay.dropLastPayload();
pay.set(prevx, prevy);
}
}
@Remote(targets = Loc.client, called = Loc.server)