X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FPlayer.java;h=83f3257d86b027c21bb03e4fcb29d6ed8e18d81f;hb=cf4113d5bfd3fca7c3815bf14a214eebd822216c;hp=9972617b5364156afb13e4b35736be8c56251868;hpb=fd73b6dd24b9fe55c0bc8f52f8aa1104a5fe3cb0;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 9972617..83f3257 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java +++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java @@ -5,6 +5,7 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch; 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; @@ -21,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; @@ -31,10 +32,21 @@ public class Player extends Mob { public boolean swim; public float headRotation = 0f; + public float blockDamage = 0f; + 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[9]; - for (int i = 0; i < 9; i++) { + inventory = new InventoryItem[36]; + for (int i = 0; i < inventory.length; i++) { inventory[i] = gameItemsHolder.getFallbackItem().toInventoryItem(); } swim = false; @@ -60,9 +72,33 @@ public class Player extends Mob { heal(MAX_HEALTH); } + public void decreaseCurrentItemCount(GameItemsHolder gameItemsHolder) { + if (gameMode == 1) { + return; + } + getCurrentItem().setAmount(getCurrentItem().getAmount() - 1); + if (getCurrentItem().getAmount() <= 0) { + setCurrentInventorySlotItem(gameItemsHolder.getFallbackItem()); + } + } + + public InventoryItem getCurrentItem() { + return inventory[slot]; + } + public void pickUpDrop(Drop drop) { + for (InventoryItem invItem : inventory) { + if (!invItem.getItem().isTool() + && invItem.getItem() == drop.getItem() + && invItem.getAmount() < invItem.getItem().getParams().getMaxStack()) { + invItem.setAmount(invItem.getAmount() + 1); + drop.setPickedUp(true); + return; + } + } + 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()) { + if (inventory(i) == null || inventory(i).getParams().getKey().equals(GameItemsHolder.FALLBACK_ITEM_KEY)) { inventory[i] = drop.getItem().toInventoryItem(); drop.setPickedUp(true); break; @@ -105,8 +141,75 @@ 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; + } + + final Block foregroundBlock = gameWorld.getForeMap(cursorX, cursorY); + final Block backgroundBlock = gameWorld.getBackMap(cursorX, cursorY); + @CheckForNull final Block target; + + if (!foregroundBlock.isNone() && foregroundBlock.getParams().getHitPoints() >= 0) { + target = foregroundBlock; + } else if (!backgroundBlock.isNone() && backgroundBlock.getParams().getHitPoints() >= 0) { + target = backgroundBlock; + } else { + target = null; + } + + final boolean canHitBlock = target != null; + + float multiplier = 1f; + final Item currentItem = inventory[slot].getItem(); + if (currentItem instanceof Item.Tool && canHitBlock) { + if (target.getParams().getToolType() == currentItem.getClass() + && ((Item.Tool)currentItem).getLevel() >= target.getParams().getToolLevel()) { + multiplier = 2f * ((Item.Tool)currentItem).getLevel(); + } + multiplier *= ((Item.Tool)currentItem).getBlockDamageMultiplier(); + } + + if (hitting && hittingWithDamage && canHitBlock) { + blockDamage += 60f * delta * multiplier; + } else { + blockDamage = 0f; + } } @Override @@ -118,6 +221,11 @@ public class Player extends Mob { if (gameMode == 1) { return; } + + if (damage > 0) { + getVelocity().y += JUMP_VELOCITY / 3f; + } + super.damage(damage); } @@ -137,8 +245,9 @@ public class Player extends Mob { } final Sprite sprite = item.getSprite(); + final boolean smallSprite = !item.isTool() || item.isShears(); - if (!item.isTool()) { + if (smallSprite) { sprite.setSize(Drop.DROP_SIZE, Drop.DROP_SIZE); } @@ -147,18 +256,22 @@ public class Player extends Mob { final SpriteOrigin spriteOrigin = item.getParams().getInHandSpriteOrigin(); final int handMultiplier = -getDirection().getBasis(); final float xOffset = (-1 + getDirection().getIndex()) * sprite.getWidth() + 4 + handMultiplier * (sprite.getWidth() * spriteOrigin.getX()); - final float yOffset = item.isTool() ? -sprite.getHeight() / 2 : 0; + final float yOffset = !smallSprite ? -sprite.getHeight() / 2 : 0; float rotate = anim + 30; + if (item.isTool()) { + sprite.rotate90(looksLeft()); + } + final float itemX = x + handLength * MathUtils.sin(handMultiplier * anim * MathUtils.degRad) + xOffset; final float itemY = y + handLength * MathUtils.cos(handMultiplier * anim * MathUtils.degRad) + yOffset; if (looksLeft()) { - sprite.setFlip(true, sprite.isFlipY()); + sprite.setFlip(!item.isTool(), sprite.isFlipY()); SpriteUtilsKt.applyOrigin(sprite, spriteOrigin.getFlipped(true, false)); } else { - sprite.setFlip(false, sprite.isFlipY()); + sprite.setFlip(item.isTool(), sprite.isFlipY()); SpriteUtilsKt.applyOrigin(sprite, spriteOrigin); } @@ -168,19 +281,28 @@ public class Player extends Mob { sprite.setFlip(false, sprite.isFlipY()); sprite.setRotation(0); sprite.setOriginCenter(); + 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; } @@ -209,8 +331,6 @@ public class Player extends Mob { @Override public void draw(SpriteBatch spriteBatch, float x, float y, float delta) { - updateAnimation(delta); - final Sprite backHand = Assets.playerSprite[1][2]; final Sprite backLeg = Assets.playerSprite[1][3]; final Sprite frontLeg = Assets.playerSprite[0][3];