X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FPlayer.java;h=47d48d8a415374d61279a2c2af1c04d3da291e6a;hb=445466cd94b52a4acdaa3e22b14533305fd73488;hp=83f3257d86b027c21bb03e4fcb29d6ed8e18d81f;hpb=cf4113d5bfd3fca7c3815bf14a214eebd822216c;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 83f3257..47d48d8 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 { @@ -26,7 +27,7 @@ public class Player extends Mob { 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,6 +37,9 @@ 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 { @@ -45,9 +49,9 @@ public class Player extends Mob { 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; } @@ -58,11 +62,6 @@ public class Player extends Mob { } } - @CheckForNull - public Item inventory(int i) { - return inventory[i].getItem(); - } - public void respawn(GameWorld gameWorld, GameItemsHolder itemsHolder) { Vector2 pos = getSpawnPoint(gameWorld, itemsHolder); this.x = pos.x; @@ -83,42 +82,73 @@ public class Player extends Mob { } public InventoryItem getCurrentItem() { - return inventory[slot]; + return inventory.get(slot); } - public void pickUpDrop(Drop drop) { - for (InventoryItem invItem : inventory) { + /** + * @return index of inventory where this drop could be placed or -1 if cant pick up + */ + public int canPickUpDrop(Drop drop) { + for (int i = 0; i < 36; i++) { + final InventoryItem invItem = inventory.get(i); + if (!invItem.getItem().isTool() && invItem.getItem() == drop.getItem() && invItem.getAmount() < invItem.getItem().getParams().getMaxStack()) { - invItem.setAmount(invItem.getAmount() + 1); - drop.setPickedUp(true); - return; + return i; } - } - for (int i = 0; i < inventory.length; i++) { - if (inventory(i) == null || inventory(i).getParams().getKey().equals(GameItemsHolder.FALLBACK_ITEM_KEY)) { - inventory[i] = drop.getItem().toInventoryItem(); - drop.setPickedUp(true); - break; + if (invItem.getItem().isNone()) { + return i; } } + + return -1; + } + + public void pickUpDrop(Drop drop) { + int index = canPickUpDrop(drop); + + if (index < 0) { + return; + } + + final InventoryItem invItem = inventory.get(index); + + if (invItem.getItem().equals(drop.getItem())) { + invItem.setAmount(invItem.getAmount() + 1); + drop.setPickedUp(true); + } else if (invItem.getItem().isNone()) { + inventory.set(index, drop.getItem().toInventoryItem()); + drop.setPickedUp(true); + } } 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) { @@ -128,7 +158,7 @@ public class Player extends Mob { } public void setCurrentInventorySlotItem(Item item) { - inventory[slot] = item.toInventoryItem(); + inventory.set(slot, item.toInventoryItem()); } @Override @@ -141,6 +171,10 @@ public class Player extends Mob { mVelocity.y = JUMP_VELOCITY; } + private boolean checkBlockCanBeHit(Block block) { + return !block.isNone() && block.getParams().getHitPoints() >= 0; + } + private void hitBlock(GameWorld gameWorld, GameItemsHolder gameItemsHolder) { if (!hitting || !hittingWithDamage) { return; @@ -149,15 +183,20 @@ public class Player extends Mob { 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 ((checkBlockCanBeHit(foregroundBlock)) || + (foregroundBlock.isNone() && checkBlockCanBeHit(backgroundBlock))) { 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; + if (!foregroundBlock.isNone()) { + if (blockDamage >= foregroundBlock.getParams().getHitPoints()) { + gameWorld.destroyForeMap(cursorX, cursorY); + blockDamage = 0; + } + } else if (!backgroundBlock.isNone()) { + if (blockDamage >= backgroundBlock.getParams().getHitPoints()) { + gameWorld.destroyBackMap(cursorX, cursorY); + blockDamage = 0; + } } } else { if (!foregroundBlock.isNone()) { @@ -185,9 +224,9 @@ public class Player extends Mob { final Block backgroundBlock = gameWorld.getBackMap(cursorX, cursorY); @CheckForNull final Block target; - if (!foregroundBlock.isNone() && foregroundBlock.getParams().getHitPoints() >= 0) { + if (checkBlockCanBeHit(foregroundBlock)) { target = foregroundBlock; - } else if (!backgroundBlock.isNone() && backgroundBlock.getParams().getHitPoints() >= 0) { + } else if (checkBlockCanBeHit(backgroundBlock)) { target = backgroundBlock; } else { target = null; @@ -196,7 +235,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()) { @@ -238,7 +277,7 @@ public class Player extends Mob { } private void drawItem(SpriteBatch spriteBatch, float x, float y, float anim) { - final Item item = inventory(slot); + final Item item = inventory.get(slot).getItem(); if (item == null || item.isNone()) { return; @@ -247,6 +286,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); } @@ -275,12 +317,15 @@ 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()); }