diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
index 7f517df7b1ead5f070110a3ad7c50c1863f425ef..b1896e4fdb8f858a3f32fd3c91bd7d36e9e4ba1c 100644 (file)
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;
if (gameMode == 1) {
return;
}
+
+ if (damage > 0) {
+ getVelocity().y += JUMP_VELOCITY / 3f;
+ }
+
super.damage(damage);
}
}
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;
sprite.setFlip(false, sprite.isFlipY());
sprite.setRotation(0);
sprite.setOriginCenter();
- sprite.rotate90(looksRight());
+ if (item.isTool()) {
+ sprite.rotate90(looksRight());
+ }
}
public void startHitting() {