X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FPlayer.java;h=83f3257d86b027c21bb03e4fcb29d6ed8e18d81f;hb=cf4113d5bfd3fca7c3815bf14a214eebd822216c;hp=a93141ad6cbcc221044129ecb1cc883fd5a06219;hpb=060595c8f929b1eba81653c5154f948fb12190ff;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 a93141a..83f3257 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
@@ -22,7 +22,7 @@ public class Player extends Mob {
     private static final float JUMP_VELOCITY = -133.332f;
     private static final int MAX_HEALTH = 20;
 
-    private boolean hitting = false;
+    private boolean hitting = false, hittingWithDamage = false;
     private float hitAnim = 0f;
     private float hitAnimDelta = ANIMATION_SPEED;
 
@@ -36,6 +36,13 @@ public class Player extends Mob {
     public int cursorX = 0;
     public int cursorY = 0;
 
+    public ControlMode controlMode = ControlMode.WALK;
+
+    public enum ControlMode {
+        WALK,
+        CURSOR
+    }
+
     public Player(GameItemsHolder gameItemsHolder) {
         super(0, 0, 4, 30, randomDir(), Type.MOB, MAX_HEALTH);
         inventory = new InventoryItem[36];
@@ -134,9 +141,41 @@ public class Player extends Mob {
         mVelocity.y = JUMP_VELOCITY;
     }
 
+    private void hitBlock(GameWorld gameWorld, GameItemsHolder gameItemsHolder) {
+        if (!hitting || !hittingWithDamage) {
+            return;
+        }
+
+        final Block foregroundBlock = gameWorld.getForeMap(cursorX, cursorY);
+        final Block backgroundBlock = gameWorld.getBackMap(cursorX, cursorY);
+
+        if ((!foregroundBlock.isNone() && foregroundBlock.getParams().getHitPoints() >= 0) ||
+                (foregroundBlock.isNone() && !backgroundBlock.isNone() && backgroundBlock.getParams().getHitPoints() >= 0)) {
+            if (gameMode == 0) {
+                if (!foregroundBlock.isNone() && blockDamage >= foregroundBlock.getParams().getHitPoints()) {
+                    gameWorld.destroyForeMap(cursorX, cursorY);
+                    blockDamage = 0;
+                } else if (!backgroundBlock.isNone() && blockDamage >= backgroundBlock.getParams().getHitPoints()) {
+                    gameWorld.destroyBackMap(cursorX, cursorY);
+                    blockDamage = 0;
+                }
+            } else {
+                if (!foregroundBlock.isNone()) {
+                    gameWorld.placeToForeground(cursorX, cursorY, gameItemsHolder.getFallbackBlock());
+                } else if (!backgroundBlock.isNone()) {
+                    gameWorld.placeToBackground(cursorX, cursorY, gameItemsHolder.getFallbackBlock());
+                }
+                stopHitting();
+            }
+        } else {
+            stopHitting();
+        }
+    }
+
     @Override
     public void ai(GameWorld gameWorld, GameItemsHolder gameItemsHolder, float delta) {
         updateAnimation(delta);
+        hitBlock(gameWorld, gameItemsHolder);
 
         if (gameMode == 1) {
             return;
@@ -166,7 +205,7 @@ public class Player extends Mob {
             multiplier *= ((Item.Tool)currentItem).getBlockDamageMultiplier();
         }
 
-        if (hitting && canHitBlock) {
+        if (hitting && hittingWithDamage && canHitBlock) {
             blockDamage += 60f * delta * multiplier;
         } else {
             blockDamage = 0f;
@@ -247,16 +286,21 @@ public class Player extends Mob {
         }
     }
 
-    public void startHitting() {
+    public void startHitting(boolean withDamage) {
         if (hitting) {
             return;
         }
 
         hitting = true;
+        hittingWithDamage = withDamage;
         hitAnim = 90f;
         hitAnimDelta = ANIMATION_SPEED;
     }
 
+    public void startHitting() {
+        startHitting(true);
+    }
+
     public void stopHitting() {
         blockDamage = 0f;
         hitting = false;