diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
index 6563fd9f7cdace58920e325301815b9577087c2c..0e8af6e0eed0407b1cc3a4be057ae2dc344f5b87 100644 (file)
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.world.GameWorld;
import ru.deadsoftware.cavedroid.misc.utils.SpriteUtilsKt;
import javax.annotation.CheckForNull;
+import java.util.ArrayList;
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 int[] inventory;
+ public final ArrayList<InventoryItem> inventory;
public int slot;
public int gameMode;
public boolean swim;
public float headRotation = 0f;
- public Player() {
+ public float blockDamage = 0f;
+ 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 int[9];
+ inventory = new ArrayList<>(36);
+ for (int i = 0; i < 36; i++) {
+ inventory.add(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.get(i).getItem();
+ }
+
+ public void respawn(GameWorld gameWorld, GameItemsHolder itemsHolder) {
+ Vector2 pos = getSpawnPoint(gameWorld, itemsHolder);
this.x = pos.x;
this.y = pos.y;
mVelocity.setZero();
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.get(slot);
+ }
+
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();
+ 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.size(); i++) {
+ if (inventory(i) == null || inventory(i).getParams().getKey().equals(GameItemsHolder.FALLBACK_ITEM_KEY)) {
+ inventory.set(i, drop.getItem().toInventoryItem());
drop.setPickedUp(true);
break;
}
}
}
- private Vector2 getSpawnPoint(GameWorld gameWorld) {
- int y;
- for (y = 0; y < gameWorld.getHeight(); y++) {
- if (y == gameWorld.getHeight() - 1) {
- y = 60;
- gameWorld.setForeMap(0, y, 1);
+ private Vector2 getSpawnPoint(GameWorld gameWorld, GameItemsHolder itemsHolder) {
+ 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.getForeMapBlock(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) {
}
}
- public void setCurrentInventorySlotItem(int itemId) {
- inventory[slot] = itemId;
+ public void setCurrentInventorySlotItem(Item item) {
+ inventory.set(slot, item.toInventoryItem());
}
@Override
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, float delta) {
+ 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.get(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
if (gameMode == 1) {
return;
}
+
+ if (damage > 0) {
+ getVelocity().y += JUMP_VELOCITY / 3f;
+ }
+
super.damage(damage);
}
}
private void drawItem(SpriteBatch spriteBatch, float x, float y, float anim) {
- final int itemId = inventory[slot];
+ final Item item = inventory(slot);
- if (itemId == 0) {
+ if (item == null || item.isNone()) {
return;
}
- final Item item = GameItems.getItem(itemId);
final Sprite sprite = item.getSprite();
+ final boolean smallSprite = !item.isTool() || item.isShears();
+
+ final float originalWidth = sprite.getWidth();
+ final float originalHeight = sprite.getHeight();
- if (!item.isTool()) {
+ if (smallSprite) {
sprite.setSize(Drop.DROP_SIZE, Drop.DROP_SIZE);
}
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);
}
- 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;
}
@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];