X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FPlayer.java;h=34a936daaa6aaaca19524ab9f66f2f6f56351654;hb=a21a93fd9fa33adebe52d1f4478866dcc3b66d96;hp=d6d848c12621aad20fd0c6c471814aaaf60b26c6;hpb=1c004c0ce7e183e773b5b486295c25e39732e899;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 d6d848c..34a936d 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
@@ -4,8 +4,9 @@ import com.badlogic.gdx.graphics.g2d.Sprite;
 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.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;
 import ru.deadsoftware.cavedroid.game.world.GameWorld;
@@ -25,18 +26,36 @@ public class Player extends Mob {
     private float hitAnim = 0f;
     private float hitAnimDelta = ANIMATION_SPEED;
 
-    public final int[] inventory;
+    public final InventoryItem[] inventory;
     public int slot;
     public int gameMode;
     public boolean swim;
     public float headRotation = 0f;
 
-    public Player() {
+    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 int[9];
+        inventory = new InventoryItem[9];
+        for (int i = 0; i < 9; i++) {
+            inventory[i] = gameItemsHolder.getFallbackItem().toInventoryItem();
+        }
         swim = false;
     }
 
+    public void initInventory(GameItemsHolder gameItemsHolder) {
+        for (InventoryItem invItem : inventory) {
+            invItem.init(gameItemsHolder);
+        }
+    }
+
+    @CheckForNull
+    public Item inventory(int i) {
+        return inventory[i].getItem();
+    }
+    
     public void respawn(GameWorld gameWorld, GameItemsHolder itemsHolder) {
         Vector2 pos = getSpawnPoint(gameWorld, itemsHolder);
         this.x = pos.x;
@@ -48,8 +67,8 @@ public class Player extends Mob {
 
     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();
+            if (inventory(i) == null || inventory(i).getParams().getKey().equals(GameItemsHolder.FALLBACK_ITEM_KEY) || inventory(i) == drop.getItem()) {
+                inventory[i] = drop.getItem().toInventoryItem();
                 drop.setPickedUp(true);
                 break;
             }
@@ -77,8 +96,8 @@ public class Player extends Mob {
         }
     }
 
-    public void setCurrentInventorySlotItem(int itemId) {
-        inventory[slot] = itemId;
+    public void setCurrentInventorySlotItem(Item item) {
+        inventory[slot] = item.toInventoryItem();
     }
 
     @Override
@@ -93,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
@@ -116,13 +168,12 @@ public class Player extends Mob {
     }
 
     private void drawItem(SpriteBatch spriteBatch, float x, float y, float anim) {
-        final int itemId = inventory[slot];
+        final Item item = inventory(slot);
 
-        if (itemId == 0) {
+        if (item == null || item.isNone()) {
             return;
         }
 
-        final Item item = GameItems.getItem(itemId);
         final Sprite sprite = item.getSprite();
 
         if (!item.isTool()) {
@@ -168,6 +219,7 @@ public class Player extends Mob {
     }
 
     public void stopHitting() {
+        blockDamage = 0f;
         hitting = false;
     }