X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2Fobjects%2FPlayer.java;h=93f68b5d43243e09c11251fb3d19f018d7218a8a;hb=ad90ec91a8a5a0b4ad7ada5692fe427a57ecb062;hp=9e2f3dd55238b18d6890794ecf7260b029e28729;hpb=6ab2a53526f16de139d39a59c3d800e5f3013c68;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/objects/Player.java b/core/src/ru/deadsoftware/cavecraft/game/objects/Player.java
index 9e2f3dd..93f68b5 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/objects/Player.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/objects/Player.java
@@ -1,42 +1,126 @@
 package ru.deadsoftware.cavecraft.game.objects;
 
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.math.MathUtils;
 import com.badlogic.gdx.math.Rectangle;
 import com.badlogic.gdx.math.Vector2;
+import ru.deadsoftware.cavecraft.game.GameItems;
+import ru.deadsoftware.cavecraft.game.mobs.Mob;
+import ru.deadsoftware.cavecraft.misc.Assets;
 
 import java.io.Serializable;
 
-public class Player implements Serializable {
-
-    public static int ANIM_SPEED = 6;
-
-    public Vector2 position;
-    public Vector2 moveX, moveY;
-    public int width, height, dir, texWidth;
-    public boolean canJump;
-    public int[] inventory;
-    public boolean flyMode = false;
-
-    public Player(Vector2 spawnPoint) {
-        position = spawnPoint.cpy();
-        moveX = new Vector2(0, 0);
-        moveY = new Vector2(0, 0);
-        width = 4;
-        height = 30;
-        texWidth = 8;
-        inventory = new int[9];
-        inventory[0] = 1;
-        inventory[1] = 2;
-        inventory[2] = 3;
-        inventory[3] = 4;
-        inventory[4] = 5;
-        inventory[5] = 6;
-        inventory[6] = 7;
-        inventory[7] = 8;
-        inventory[8] = 9;
+import static ru.deadsoftware.cavecraft.GameScreen.GP;
+
+public class Player extends Mob implements Serializable {
+
+    public int[] inv;
+    public int invSlot;
+    public int gameMode;
+    public boolean swim;
+
+    public Player(int gameMode) {
+        super(0, 0, 4, 30, 1, true);
+        this.gameMode = gameMode;
+        inv = new int[9];
+        pos = getSpawnPoint().cpy();
+        swim = false;
+    }
+
+    public void respawn() {
+        pos.set(getSpawnPoint());
+        mov.setZero();
+    }
+
+    private Vector2 getSpawnPoint() {
+        int x = 0, y;
+        for (y = 0; y < GP.world.getHeight(); y++) {
+            if (y == GP.world.getHeight() - 1) {
+                y = 60;
+                GP.world.setForeMap(x, y, 1);
+                break;
+            }
+            if (GP.world.getForeMap(x, y) > 0 && GameItems.getBlock(GP.world.getForeMap(x, y)).hasCollision()) break;
+        }
+        return new Vector2(x * 16 + 8 - (float) getWidth() / 2, (float) y * 16 - getHeight());
+    }
+
+    public void setDir(int dir) {
+        if (dir != getDir()) switchDir();
+    }
+
+    @Override
+    public void ai() {
+    }
+
+    @Override
+    public void changeDir() {
+    }
+
+    @Override
+    public void draw(SpriteBatch spriteBatch, float x, float y) {
+        if (mov.x != 0 || Assets.plSprite[0][2].getRotation() != 0) {
+            Assets.plSprite[0][2].rotate(animDelta);
+            Assets.plSprite[1][2].rotate(-animDelta);
+            Assets.plSprite[0][3].rotate(-animDelta);
+            Assets.plSprite[1][3].rotate(animDelta);
+        } else {
+            Assets.plSprite[0][2].setRotation(0);
+            Assets.plSprite[1][2].setRotation(0);
+            Assets.plSprite[0][3].setRotation(0);
+            Assets.plSprite[1][3].setRotation(0);
+        }
+        if (Assets.plSprite[0][2].getRotation() >= 60 || Assets.plSprite[0][2].getRotation() <= -60)
+            animDelta = -animDelta;
+
+        //back hand
+        Assets.plSprite[1][2].setPosition(x - 6, y);
+        Assets.plSprite[1][2].draw(spriteBatch);
+        //back leg
+        Assets.plSprite[1][3].setPosition(x - 6, y + 10);
+        Assets.plSprite[1][3].draw(spriteBatch);
+        //front leg
+        Assets.plSprite[0][3].setPosition(x - 6, y + 10);
+        Assets.plSprite[0][3].draw(spriteBatch);
+        //head
+        spriteBatch.draw(Assets.plSprite[getDir()][0], x - 2, y - 2);
+        //body
+        spriteBatch.draw(Assets.plSprite[getDir()][1], x - 2, y + 8);
+        //item in hand
+        if (inv[invSlot] > 0) {
+            float handRotation = MathUtils.degRad * Assets.plSprite[0][2].getRotation();
+            switch (GameItems.getItem(inv[invSlot]).getType()) {
+                case 0:
+                    Assets.blockTex[GameItems.getItem(inv[invSlot]).getTex()].setPosition(
+                            x - 8 * MathUtils.sin(handRotation),
+                            y + 6 + 8 * MathUtils.cos(handRotation));
+                    Assets.blockTex[GameItems.getItem(inv[invSlot]).getTex()].draw(spriteBatch);
+                    break;
+                default:
+                    Assets.itemTex[GameItems.getItem(inv[invSlot]).getTex()].flip((getDir() == 0), false);
+                    Assets.itemTex[GameItems.getItem(inv[invSlot]).getTex()].setRotation(
+                            -45 + getDir() * 90 + Assets.plSprite[0][2].getRotation());
+                    Assets.itemTex[GameItems.getItem(inv[invSlot]).getTex()].setPosition(
+                            x - 10 + (12 * getDir()) - 8 * MathUtils.sin(handRotation),
+                            y + 2 + 8 * MathUtils.cos(handRotation));
+                    Assets.itemTex[GameItems.getItem(inv[invSlot]).getTex()].draw(spriteBatch);
+                    Assets.itemTex[GameItems.getItem(inv[invSlot]).getTex()].flip((getDir() == 0), false);
+                    break;
+            }
+        }
+        //front hand
+        Assets.plSprite[0][2].setPosition(x - 6, y);
+        Assets.plSprite[0][2].draw(spriteBatch);
+    }
+
+    @Override
+    public int getType() {
+        return 0;
     }
 
+    @Override
     public Rectangle getRect() {
-        return new Rectangle(position.x+2, position.y, width, height);
+        return new Rectangle(pos.x, pos.y, getWidth(), getHeight());
     }
 
 }