Fix tools facing wrong direction

[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 bce9a2c435a0da4e2d81c794af791f95f55d9a49..7f517df7b1ead5f070110a3ad7c50c1863f425ef 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
@@ -5,6 +5,7 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.math.MathUtils;
 import com.badlogic.gdx.math.Vector2;
 import ru.deadsoftware.cavedroid.game.GameItemsHolder;
+import ru.deadsoftware.cavedroid.game.model.block.Block;
 import ru.deadsoftware.cavedroid.game.model.item.InventoryItem;
 import ru.deadsoftware.cavedroid.game.model.item.Item;
 import ru.deadsoftware.cavedroid.game.objects.Drop;
@@ -31,6 +32,10 @@ public class Player extends Mob {
     public boolean swim;
     public float headRotation = 0f;
 
+    public float blockDamage = 0f;
+    public int cursorX = 0;
+    public int cursorY = 0;
+
     public Player(GameItemsHolder gameItemsHolder) {
         super(0, 0, 4, 30, randomDir(), Type.MOB, MAX_HEALTH);
         inventory = new InventoryItem[9];
@@ -107,6 +112,39 @@ public class Player extends Mob {
 
     @Override
     public void ai(GameWorld gameWorld, GameItemsHolder gameItemsHolder, float 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 = 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 * multiplier;
+        } else {
+            blockDamage = 0f;
+        }
     }
 
     @Override
@@ -132,7 +170,7 @@ public class Player extends Mob {
     private void drawItem(SpriteBatch spriteBatch, float x, float y, float anim) {
         final Item item = inventory(slot);
 
-        if (item == null || item.getParams().getKey().equals(GameItemsHolder.FALLBACK_ITEM_KEY)) {
+        if (item == null || item.isNone()) {
             return;
         }
 
@@ -151,14 +189,18 @@ public class Player extends Mob {
 
         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);
         }
 
@@ -168,6 +210,7 @@ public class Player extends Mob {
         sprite.setFlip(false, sprite.isFlipY());
         sprite.setRotation(0);
         sprite.setOriginCenter();
+        sprite.rotate90(looksRight());
     }
 
     public void startHitting() {
@@ -181,6 +224,7 @@ public class Player extends Mob {
     }
 
     public void stopHitting() {
+        blockDamage = 0f;
         hitting = false;
     }