X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FPlayer.java;h=34a936daaa6aaaca19524ab9f66f2f6f56351654;hb=a21a93fd9fa33adebe52d1f4478866dcc3b66d96;hp=8fce1169be150a7a5e568adf1925ef6cb014afd2;hpb=46c9d587bf0b5ef342e2073b69b40cb5438109d9;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 8fce116..34a936d 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java +++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java @@ -4,9 +4,11 @@ import com.badlogic.gdx.graphics.g2d.Sprite; import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.math.Vector2; -import ru.deadsoftware.cavedroid.game.GameItems; +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; -import ru.deadsoftware.cavedroid.game.objects.Item; import ru.deadsoftware.cavedroid.game.world.GameWorld; import ru.deadsoftware.cavedroid.misc.Assets; import ru.deadsoftware.cavedroid.misc.utils.SpriteOrigin; @@ -18,51 +20,70 @@ public class Player extends Mob { private static final float SPEED = 69.072f; private static final float JUMP_VELOCITY = -133.332f; + private static final int MAX_HEALTH = 20; private boolean hitting = false; private float hitAnim = 0f; private float hitAnimDelta = ANIMATION_SPEED; - public final int[] inventory; + public final InventoryItem[] inventory; public int slot; - public final int gameMode; + public int gameMode; public boolean swim; public float headRotation = 0f; - public Player() { - super(0, 0, 4, 30, randomDir(), Type.MOB); - this.gameMode = 1; - inventory = new int[9]; + 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]; + for (int i = 0; i < 9; i++) { + inventory[i] = gameItemsHolder.getFallbackItem().toInventoryItem(); + } swim = false; } - public void respawn(GameWorld gameWorld) { - Vector2 pos = getSpawnPoint(gameWorld); + public void initInventory(GameItemsHolder gameItemsHolder) { + for (InventoryItem invItem : inventory) { + invItem.init(gameItemsHolder); + } + } + + @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; this.y = pos.y; mVelocity.setZero(); mDead = false; + heal(MAX_HEALTH); } public void pickUpDrop(Drop drop) { for (int i = 0; i < inventory.length; i++) { - if (inventory[i] == 0 || inventory[i] == drop.getId()) { - inventory[i] = drop.getId(); + if (inventory(i) == null || inventory(i).getParams().getKey().equals(GameItemsHolder.FALLBACK_ITEM_KEY) || inventory(i) == drop.getItem()) { + inventory[i] = drop.getItem().toInventoryItem(); drop.setPickedUp(true); break; } } } - private Vector2 getSpawnPoint(GameWorld gameWorld) { + 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, 1); + gameWorld.setForeMap(0, y, itemsHolder.getBlock("grass")); break; } - if (gameWorld.hasForeAt(0, y) && gameWorld.getForeMapBlock(0, y).hasCollision()) { + if (gameWorld.hasForeAt(0, y) && gameWorld.getForeMap(0, y).hasCollision()) { break; } } @@ -75,6 +96,10 @@ public class Player extends Mob { } } + public void setCurrentInventorySlotItem(Item item) { + inventory[slot] = item.toInventoryItem(); + } + @Override public float getSpeed() { return SPEED; @@ -86,32 +111,78 @@ public class Player extends Mob { } @Override - public void ai(GameWorld gameWorld, float delta) { + 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); + @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 && canHitBlock) { + blockDamage += 60f * delta * multiplier; + } else { + blockDamage = 0f; + } } @Override public void changeDir() { } - private void drawItem(SpriteBatch spriteBatch, float x, float y, float anim) { - final int itemId = inventory[slot]; - final Item item = GameItems.getItem(itemId); + @Override + public void damage(int damage) { + if (gameMode == 1) { + return; + } + super.damage(damage); + } + + @Override + public void heal(int heal) { + if (gameMode == 1) { + return; + } + super.heal(heal); + } - @CheckForNull final Sprite sprite = item.isBlock() - ? item.toBlock().getTexture() - : item.getSprite(); + private void drawItem(SpriteBatch spriteBatch, float x, float y, float anim) { + final Item item = inventory(slot); - if (sprite == null) { + if (item == null || item.isNone()) { return; } + final Sprite sprite = item.getSprite(); + if (!item.isTool()) { sprite.setSize(Drop.DROP_SIZE, Drop.DROP_SIZE); } final float handLength = Assets.playerSprite[0][2].getHeight(); - final SpriteOrigin spriteOrigin = item.getDefaultOrigin(); + 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; @@ -148,6 +219,7 @@ public class Player extends Mob { } public void stopHitting() { + blockDamage = 0f; hitting = false; } @@ -156,6 +228,7 @@ public class Player extends Mob { if (hitAnim < 30f || hitAnim > 90f) { if (hitting) { + hitAnim = MathUtils.clamp(hitAnim, 30f, 90f); hitAnimDelta = -hitAnimDelta; } else { hitAnimDelta = ANIMATION_SPEED;