X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FPlayer.java;h=a93141ad6cbcc221044129ecb1cc883fd5a06219;hb=060595c8f929b1eba81653c5154f948fb12190ff;hp=216db6abbf0f3d6b435fe4ce5c0ef57f2af7b93b;hpb=3512986410bc04017c9c15d3bebac5fe5cdd0e84;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
index 216db6a..a93141a 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
@@ -38,8 +38,8 @@ public class Player extends Mob {
 
     public Player(GameItemsHolder gameItemsHolder) {
         super(0, 0, 4, 30, randomDir(), Type.MOB, MAX_HEALTH);
-        inventory = new InventoryItem[9];
-        for (int i = 0; i < 9; i++) {
+        inventory = new InventoryItem[36];
+        for (int i = 0; i < inventory.length; i++) {
             inventory[i] = gameItemsHolder.getFallbackItem().toInventoryItem();
         }
         swim = false;
@@ -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;
@@ -112,18 +136,38 @@ public class Player extends Mob {
 
     @Override
     public void ai(GameWorld gameWorld, GameItemsHolder gameItemsHolder, float delta) {
+        updateAnimation(delta);
+
         if (gameMode == 1) {
             return;
         }
 
         final Block foregroundBlock = gameWorld.getForeMap(cursorX, cursorY);
         final Block backgroundBlock = gameWorld.getBackMap(cursorX, cursorY);
+        @CheckForNull final Block target;
+
+        if (!foregroundBlock.isNone() && foregroundBlock.getParams().getHitPoints() >= 0) {
+            target = foregroundBlock;
+        } else if (!backgroundBlock.isNone() && backgroundBlock.getParams().getHitPoints() >= 0) {
+            target = backgroundBlock;
+        } else {
+            target = null;
+        }
 
-        final boolean canHitBlock = !foregroundBlock.isNone() && foregroundBlock.getParams().getHitPoints() >= 0
-                || !backgroundBlock.isNone() && backgroundBlock.getParams().getHitPoints() >= 0;
+        final boolean canHitBlock = target != null;
+
+        float multiplier = 1f;
+        final Item currentItem = inventory[slot].getItem();
+        if (currentItem instanceof Item.Tool && canHitBlock) {
+            if (target.getParams().getToolType() == currentItem.getClass()
+                    && ((Item.Tool)currentItem).getLevel() >= target.getParams().getToolLevel()) {
+                multiplier = 2f * ((Item.Tool)currentItem).getLevel();
+            }
+            multiplier *= ((Item.Tool)currentItem).getBlockDamageMultiplier();
+        }
 
         if (hitting && canHitBlock) {
-            blockDamage += 60f * delta;
+            blockDamage += 60f * delta * multiplier;
         } else {
             blockDamage = 0f;
         }
@@ -138,6 +182,11 @@ public class Player extends Mob {
         if (gameMode == 1) {
             return;
         }
+
+        if (damage > 0) {
+            getVelocity().y += JUMP_VELOCITY / 3f;
+        }
+
         super.damage(damage);
     }
 
@@ -157,8 +206,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);
         }
 
@@ -167,18 +217,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);
         }
 
@@ -188,6 +242,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() {
@@ -230,8 +287,6 @@ public class Player extends Mob {
 
     @Override
     public void draw(SpriteBatch spriteBatch, float x, float y, float delta) {
-        updateAnimation(delta);
-
         final Sprite backHand = Assets.playerSprite[1][2];
         final Sprite backLeg = Assets.playerSprite[1][3];
         final Sprite frontLeg = Assets.playerSprite[0][3];