diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/player/Player.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/player/Player.java
index 241714a3579cc8bfb94e5d0fd39017cc0169ee4c..5fcfe319b80f886499cb42f17e53f7d29db5f5db 100644 (file)
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.model.item.InventoryItem;
import ru.deadsoftware.cavedroid.game.model.item.Item;
import ru.deadsoftware.cavedroid.game.objects.Drop;
+import ru.deadsoftware.cavedroid.game.objects.DropController;
import ru.deadsoftware.cavedroid.game.ui.TooltipManager;
import ru.deadsoftware.cavedroid.game.world.GameWorld;
import ru.deadsoftware.cavedroid.misc.Assets;
import ru.deadsoftware.cavedroid.game.ui.TooltipManager;
import ru.deadsoftware.cavedroid.game.world.GameWorld;
import ru.deadsoftware.cavedroid.misc.Assets;
private static final float SPEED = 69.072f;
private static final float JUMP_VELOCITY = -133.332f;
private static final float SPEED = 69.072f;
private static final float JUMP_VELOCITY = -133.332f;
+ private static final int SURVIVAL_CURSOR_RANGE = 4;
public static final int MAX_HEALTH = 20;
public static final int INVENTORY_SIZE = 36;
public static final int MAX_HEALTH = 20;
public static final int INVENTORY_SIZE = 36;
}
}
}
}
+ public void dropCurrentItem(DropController dropController) {
+ final InventoryItem activeItem = inventory.getActiveItem();
+
+ }
+
private Vector2 getSpawnPoint(GameWorld gameWorld, GameItemsHolder itemsHolder) {
if (spawnPoint != null) {
return spawnPoint;
private Vector2 getSpawnPoint(GameWorld gameWorld, GameItemsHolder itemsHolder) {
if (spawnPoint != null) {
return spawnPoint;
@Override
public void jump() {
@Override
public void jump() {
+ if (!canJump()) {
+ if (gameMode == 1) {
+ if (isFlyMode()) {
+ setFlyMode(false);
+ } else {
+ getVelocity().y = 0f;
+ setFlyMode(true);
+ }
+ }
+ return;
+ }
mVelocity.y = JUMP_VELOCITY;
}
mVelocity.y = JUMP_VELOCITY;
}
super.heal(heal);
}
super.heal(heal);
}
+ public void checkCursorBounds(GameWorld gameWorld) {
+ if (gameMode == 0) {
+ int minCursorX = getMapX() - SURVIVAL_CURSOR_RANGE;
+ int maxCursorX = getMapX() + SURVIVAL_CURSOR_RANGE;
+ int minCursorY = getMiddleMapY() - SURVIVAL_CURSOR_RANGE;
+ int maxCursorY = getMiddleMapY() + SURVIVAL_CURSOR_RANGE;
+
+ cursorX = MathUtils.clamp(cursorX, minCursorX, maxCursorX);
+ cursorY = MathUtils.clamp(cursorY, minCursorY, maxCursorY);
+ }
+
+ cursorY = MathUtils.clamp(cursorY, 0, gameWorld.getHeight() - 1);
+ }
+
private void drawItem(SpriteBatch spriteBatch, float x, float y, float anim) {
final Item item = inventory.getActiveItem().getItem();
private void drawItem(SpriteBatch spriteBatch, float x, float y, float anim) {
final Item item = inventory.getActiveItem().getItem();