X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=sidebyside;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FPlayer.java;h=216db6abbf0f3d6b435fe4ce5c0ef57f2af7b93b;hb=3512986410bc04017c9c15d3bebac5fe5cdd0e84;hp=9972617b5364156afb13e4b35736be8c56251868;hpb=9e390d2131e2f1eaa886956b2b657b35d6d1b5f9;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 9972617..216db6a 100644
--- 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,21 @@ 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);
+
+        final boolean canHitBlock = !foregroundBlock.isNone() && foregroundBlock.getParams().getHitPoints() >= 0
+                || !backgroundBlock.isNone() && backgroundBlock.getParams().getHitPoints() >= 0;
+
+        if (hitting && canHitBlock) {
+            blockDamage += 60f * delta;
+        } else {
+            blockDamage = 0f;
+        }
     }
 
     @Override
@@ -181,6 +201,7 @@ public class Player extends Mob {
     }
 
     public void stopHitting() {
+        blockDamage = 0f;
         hitting = false;
     }