diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
index 9972617b5364156afb13e4b35736be8c56251868..216db6abbf0f3d6b435fe4ce5c0ef57f2af7b93b 100644 (file)
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;
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];
@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
}
public void stopHitting() {
+ blockDamage = 0f;
hitting = false;
}