diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
index 34232f705e7e3fdf4303b6db6ecd16488de2c061..9972617b5364156afb13e4b35736be8c56251868 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.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;
private float hitAnim = 0f;
private float hitAnimDelta = ANIMATION_SPEED;
- public final int[] inventory;
+ public final InventoryItem[] inventory;
public int slot;
public int gameMode;
public boolean swim;
public float headRotation = 0f;
- public Player() {
+ public Player(GameItemsHolder gameItemsHolder) {
super(0, 0, 4, 30, randomDir(), Type.MOB, MAX_HEALTH);
- inventory = new int[9];
+ 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();
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;
}
}
}
}
+ public void setCurrentInventorySlotItem(Item item) {
+ inventory[slot] = item.toInventoryItem();
+ }
+
@Override
public float getSpeed() {
return SPEED;
}
@Override
- public void ai(GameWorld gameWorld, float delta) {
+ public void ai(GameWorld gameWorld, GameItemsHolder gameItemsHolder, float delta) {
}
@Override
}
private void drawItem(SpriteBatch spriteBatch, float x, float y, float anim) {
- final int itemId = inventory[slot];
- final Item item = GameItems.getItem(itemId);
+ final Item item = inventory(slot);
- @CheckForNull final Sprite sprite = item.isBlock()
- ? item.toBlock().getTexture()
- : item.getSprite();
-
- 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;
if (hitAnim < 30f || hitAnim > 90f) {
if (hitting) {
+ hitAnim = MathUtils.clamp(hitAnim, 30f, 90f);
hitAnimDelta = -hitAnimDelta;
} else {
hitAnimDelta = ANIMATION_SPEED;