X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FPlayer.java;h=0e8af6e0eed0407b1cc3a4be057ae2dc344f5b87;hb=387ad284ceb79b07cba3726fa7350b7e83916815;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..0e8af6e 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java +++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java @@ -15,6 +15,7 @@ import ru.deadsoftware.cavedroid.misc.utils.SpriteOrigin; import ru.deadsoftware.cavedroid.misc.utils.SpriteUtilsKt; import javax.annotation.CheckForNull; +import java.util.ArrayList; public class Player extends Mob { @@ -22,11 +23,11 @@ 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; - public final InventoryItem[] inventory; + public final ArrayList inventory; public int slot; public int gameMode; public boolean swim; @@ -36,11 +37,21 @@ public class Player extends Mob { public int cursorX = 0; public int cursorY = 0; + @CheckForNull + private Vector2 spawnPoint = null; + + 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]; - for (int i = 0; i < inventory.length; i++) { - inventory[i] = gameItemsHolder.getFallbackItem().toInventoryItem(); + inventory = new ArrayList<>(36); + for (int i = 0; i < 36; i++) { + inventory.add(gameItemsHolder.getFallbackItem().toInventoryItem()); } swim = false; } @@ -53,7 +64,7 @@ public class Player extends Mob { @CheckForNull public Item inventory(int i) { - return inventory[i].getItem(); + return inventory.get(i).getItem(); } public void respawn(GameWorld gameWorld, GameItemsHolder itemsHolder) { @@ -76,7 +87,7 @@ public class Player extends Mob { } public InventoryItem getCurrentItem() { - return inventory[slot]; + return inventory.get(slot); } public void pickUpDrop(Drop drop) { @@ -90,9 +101,9 @@ public class Player extends Mob { } } - for (int i = 0; i < inventory.length; i++) { + for (int i = 0; i < inventory.size(); i++) { if (inventory(i) == null || inventory(i).getParams().getKey().equals(GameItemsHolder.FALLBACK_ITEM_KEY)) { - inventory[i] = drop.getItem().toInventoryItem(); + inventory.set(i, drop.getItem().toInventoryItem()); drop.setPickedUp(true); break; } @@ -100,18 +111,30 @@ public class Player extends Mob { } private Vector2 getSpawnPoint(GameWorld gameWorld, GameItemsHolder itemsHolder) { - int y; - for (y = 0; y < gameWorld.getHeight(); y++) { - if (y == gameWorld.getHeight() - 1) { - y = 60; - gameWorld.setForeMap(0, y, itemsHolder.getBlock("grass")); + if (spawnPoint != null) { + return spawnPoint; + } + + int y, x = gameWorld.getWidth() / 2; + for (y = 0; y <= gameWorld.getWorldConfig().getSeaLevel(); y++) { + if (y == gameWorld.getWorldConfig().getSeaLevel()) { + for (x = 0; x < gameWorld.getWidth(); x++) { + if (gameWorld.getForeMap(x, y).getParams().getHasCollision()) { + break; + } + if (x == gameWorld.getWidth() - 1) { + gameWorld.setForeMap(x, y, itemsHolder.getBlock("grass")); + break; + } + } break; } - if (gameWorld.hasForeAt(0, y) && gameWorld.getForeMap(0, y).hasCollision()) { + if (gameWorld.hasForeAt(x, y) && gameWorld.getForeMap(x, y).hasCollision()) { break; } } - return new Vector2(8 - getWidth() / 2, (float) y * 16 - getHeight()); + spawnPoint = new Vector2(x * 16 + 8 - getWidth() / 2, (float) y * 16 - getHeight()); + return spawnPoint; } public void setDir(Direction dir) { @@ -121,7 +144,7 @@ public class Player extends Mob { } public void setCurrentInventorySlotItem(Item item) { - inventory[slot] = item.toInventoryItem(); + inventory.set(slot, item.toInventoryItem()); } @Override @@ -134,9 +157,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; @@ -157,7 +212,7 @@ public class Player extends Mob { final boolean canHitBlock = target != null; float multiplier = 1f; - final Item currentItem = inventory[slot].getItem(); + final Item currentItem = inventory.get(slot).getItem(); if (currentItem instanceof Item.Tool && canHitBlock) { if (target.getParams().getToolType() == currentItem.getClass() && ((Item.Tool)currentItem).getLevel() >= target.getParams().getToolLevel()) { @@ -166,7 +221,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; @@ -208,6 +263,9 @@ public class Player extends Mob { final Sprite sprite = item.getSprite(); final boolean smallSprite = !item.isTool() || item.isShears(); + final float originalWidth = sprite.getWidth(); + final float originalHeight = sprite.getHeight(); + if (smallSprite) { sprite.setSize(Drop.DROP_SIZE, Drop.DROP_SIZE); } @@ -236,27 +294,35 @@ public class Player extends Mob { SpriteUtilsKt.applyOrigin(sprite, spriteOrigin); } - SpriteUtilsKt.drawSprite(spriteBatch, sprite, itemX, itemY, -handMultiplier * rotate); + sprite.setRotation(-handMultiplier * rotate); + sprite.setPosition(itemX, itemY); + sprite.draw(spriteBatch); // dont forget to reset sprite.setFlip(false, sprite.isFlipY()); sprite.setRotation(0); sprite.setOriginCenter(); + sprite.setSize(originalWidth, originalHeight); if (item.isTool()) { sprite.rotate90(looksRight()); } } - 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;