diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
index 580665ef8950f1daa3d6ab59faf1776412e7d5ab..93150b6a5d3f4870187251071d4dfabf2bdeff2c 100644 (file)
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.math.Vector2;
+import ru.deadsoftware.cavedroid.game.GameItems;
+import ru.deadsoftware.cavedroid.game.objects.Drop;
+import ru.deadsoftware.cavedroid.game.objects.Item;
import ru.deadsoftware.cavedroid.game.world.GameWorld;
import ru.deadsoftware.cavedroid.misc.Assets;
+import ru.deadsoftware.cavedroid.misc.utils.SpriteOrigin;
import ru.deadsoftware.cavedroid.misc.utils.SpriteUtilsKt;
+import javax.annotation.CheckForNull;
+
public class Player extends Mob {
public final int[] inventory;
this.x = pos.x;
this.y = pos.y;
mVelocity.setZero();
+ mDead = false;
+ }
+
+ public void pickUpDrop(Drop drop) {
+ for (int i = 0; i < inventory.length; i++) {
+ if (inventory[i] == 0 || inventory[i] == drop.getId()) {
+ inventory[i] = drop.getId();
+ drop.setPickedUp(true);
+ break;
+ }
+ }
}
private Vector2 getSpawnPoint(GameWorld gameWorld) {
return new Vector2(8 - getWidth() / 2, (float) y * 16 - getHeight());
}
- private boolean isAnimationIncreasing() {
- return mAnim > 0 && mAnimDelta > 0 || mAnim < 0 && mAnimDelta < 0;
- }
-
- private void updateAnimation(float delta) {
- if (mVelocity.x != 0f || Math.abs(mAnim) > 5f) {
- mAnim += mAnimDelta * delta;
- } else {
- mAnim = 0;
- }
-
- if (mAnim > 60f) {
- mAnim = 60f;
- mAnimDelta = -ANIMATION_SPEED;
- } else if (mAnim < -60f) {
- mAnim = -60f;
- mAnimDelta = ANIMATION_SPEED;
- }
-
- if (mVelocity.x == 0f && isAnimationIncreasing()) {
- mAnimDelta = -mAnimDelta;
- }
- }
-
public void setDir(Direction dir) {
if (dir != getDirection()) {
switchDir();
public void changeDir() {
}
+ private void drawItem(SpriteBatch spriteBatch, float x, float y) {
+ final int itemId = inventory[slot];
+ final Item item = GameItems.getItem(itemId);
+
+ @CheckForNull final Sprite sprite = item.isBlock()
+ ? item.toBlock().getTexture()
+ : item.getSprite();
+
+ if (sprite == null) {
+ return;
+ }
+
+ if (!item.isTool()) {
+ sprite.setSize(Drop.DROP_SIZE, Drop.DROP_SIZE);
+ }
+
+ final float handLength = Assets.playerSprite[0][2].getHeight();
+
+ final SpriteOrigin spriteOrigin = item.getDefaultOrigin();
+ final int handMultiplier = 1 + -2 * dirMultiplier();
+ final float xOffset = (-1 + dirMultiplier()) * sprite.getWidth() + 4 + handMultiplier * (sprite.getWidth() * spriteOrigin.getX());
+ final float yOffset = item.isTool() ? -sprite.getHeight() / 2 : 0;
+
+ float rotate = mAnim + 30;
+
+ final float itemX = x + handLength * MathUtils.sin(handMultiplier * mAnim * MathUtils.degRad) + xOffset;
+ final float itemY = y + handLength * MathUtils.cos(handMultiplier * mAnim * MathUtils.degRad) + yOffset;
+
+ if (looksLeft()) {
+ sprite.setFlip(true, sprite.isFlipY());
+ SpriteUtilsKt.applyOrigin(sprite, spriteOrigin.getFlipped(true, false));
+ } else {
+ sprite.setFlip(false, sprite.isFlipY());
+ SpriteUtilsKt.applyOrigin(sprite, spriteOrigin);
+ }
+
+ SpriteUtilsKt.draw(spriteBatch, sprite, itemX, itemY, -handMultiplier * rotate);
+
+ // dont forget to reset
+ sprite.setFlip(false, sprite.isFlipY());
+ sprite.setRotation(0);
+ sprite.setOriginCenter();
+ }
+
@Override
public void draw(SpriteBatch spriteBatch, float x, float y, float delta) {
updateAnimation(delta);
final Sprite frontHand = Assets.playerSprite[0][2];
SpriteUtilsKt.draw(spriteBatch, backHand, x + 2, y + 8, -mAnim);
+
+ if (looksLeft()) {
+ drawItem(spriteBatch, x, y);
+ }
+
SpriteUtilsKt.draw(spriteBatch, backLeg, x + 2, y + 20, mAnim);
SpriteUtilsKt.draw(spriteBatch, frontLeg, x + 2, y + 20, -mAnim);
SpriteUtilsKt.draw(spriteBatch, head, x, y, headRotation);
SpriteUtilsKt.draw(spriteBatch, body, x + 2, y + 8);
+
+ if (looksRight()) {
+ drawItem(spriteBatch, x, y);
+ }
+
SpriteUtilsKt.draw(spriteBatch, frontHand, x + 2, y + 8, mAnim);
}