This commit is contained in:
Anuken
2020-09-14 16:56:32 -04:00
parent b603409f74
commit 757e0fbda0
2 changed files with 4 additions and 2 deletions
@@ -61,7 +61,7 @@ abstract class HitboxComp implements Posc, QuadTreeObject{
} }
public void hitboxTile(Rect rect){ public void hitboxTile(Rect rect){
float scale = 0.66f; float size = hitSize * 0.66f;
rect.setCentered(x, y, hitSize * scale, hitSize * scale); rect.setCentered(x, y, size, size);
} }
} }
@@ -41,6 +41,8 @@ public class PayloadRouter extends PayloadConveyor{
do{ do{
rotation = (rotation + 1) % 4; rotation = (rotation + 1) % 4;
onProximityUpdate(); onProximityUpdate();
//this condition intentionally uses "accept from itself" conditions, because payload conveyors only accept during the start
//"accept from self" conditions are for dropped payloads and are less restrictive
}while((blocked || next == null || !next.acceptPayload(next, item)) && ++rotations < 4); }while((blocked || next == null || !next.acceptPayload(next, item)) && ++rotations < 4);
} }
} }