diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
index 34a936daaa6aaaca19524ab9f66f2f6f56351654..46cb8cd1fc250d8fab4582ba23cad5e67e19b114 100644 (file)
}
final Sprite sprite = item.getSprite();
+ final boolean smallSprite = !item.isTool() || item.isShears();
- if (!item.isTool()) {
+ if (smallSprite) {
sprite.setSize(Drop.DROP_SIZE, Drop.DROP_SIZE);
}
final SpriteOrigin spriteOrigin = item.getParams().getInHandSpriteOrigin();
final int handMultiplier = -getDirection().getBasis();
final float xOffset = (-1 + getDirection().getIndex()) * sprite.getWidth() + 4 + handMultiplier * (sprite.getWidth() * spriteOrigin.getX());
- final float yOffset = item.isTool() ? -sprite.getHeight() / 2 : 0;
+ final float yOffset = !smallSprite ? -sprite.getHeight() / 2 : 0;
float rotate = anim + 30;
+ if (item.isTool()) {
+ sprite.rotate90(looksLeft());
+ }
+
final float itemX = x + handLength * MathUtils.sin(handMultiplier * anim * MathUtils.degRad) + xOffset;
final float itemY = y + handLength * MathUtils.cos(handMultiplier * anim * MathUtils.degRad) + yOffset;
if (looksLeft()) {
- sprite.setFlip(true, sprite.isFlipY());
+ sprite.setFlip(!item.isTool(), sprite.isFlipY());
SpriteUtilsKt.applyOrigin(sprite, spriteOrigin.getFlipped(true, false));
} else {
- sprite.setFlip(false, sprite.isFlipY());
+ sprite.setFlip(item.isTool(), sprite.isFlipY());
SpriteUtilsKt.applyOrigin(sprite, spriteOrigin);
}
sprite.setFlip(false, sprite.isFlipY());
sprite.setRotation(0);
sprite.setOriginCenter();
+ if (item.isTool()) {
+ sprite.rotate90(looksRight());
+ }
}
public void startHitting() {