Add items count and tools duration

[cavedroid.git] / core / src / ru / deadsoftware / cavedroid / game / mobs / Player.java

diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
index 34a936daaa6aaaca19524ab9f66f2f6f56351654..6e0dfe394700d5f1e63eeb9b5e33c0f5b2c2a930 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
@@ -65,9 +65,33 @@ public class Player extends Mob {
         heal(MAX_HEALTH);
     }
 
+    public void decreaseCurrentItemCount(GameItemsHolder gameItemsHolder) {
+        if (gameMode == 1) {
+            return;
+        }
+        getCurrentItem().setAmount(getCurrentItem().getAmount() - 1);
+        if (getCurrentItem().getAmount() <= 0) {
+            setCurrentInventorySlotItem(gameItemsHolder.getFallbackItem());
+        }
+    }
+
+    public InventoryItem getCurrentItem() {
+        return inventory[slot];
+    }
+
     public void pickUpDrop(Drop drop) {
+        for (InventoryItem invItem : inventory) {
+            if (!invItem.getItem().isTool()
+                    && invItem.getItem() == drop.getItem()
+                    && invItem.getAmount() < invItem.getItem().getParams().getMaxStack()) {
+                invItem.setAmount(invItem.getAmount() + 1);
+                drop.setPickedUp(true);
+                return;
+            }
+        }
+
         for (int i = 0; i < inventory.length; i++) {
-            if (inventory(i) == null || inventory(i).getParams().getKey().equals(GameItemsHolder.FALLBACK_ITEM_KEY) || inventory(i) == drop.getItem()) {
+            if (inventory(i) == null || inventory(i).getParams().getKey().equals(GameItemsHolder.FALLBACK_ITEM_KEY)) {
                 inventory[i] = drop.getItem().toInventoryItem();
                 drop.setPickedUp(true);
                 break;
@@ -175,8 +199,9 @@ public class Player extends Mob {
         }
 
         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);
         }
 
@@ -185,18 +210,22 @@ public class Player extends Mob {
         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);
         }
 
@@ -206,6 +235,9 @@ public class Player extends Mob {
         sprite.setFlip(false, sprite.isFlipY());
         sprite.setRotation(0);
         sprite.setOriginCenter();
+        if (item.isTool()) {
+            sprite.rotate90(looksRight());
+        }
     }
 
     public void startHitting() {