X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FPlayer.java;h=ebdd9c0dbed6281204809267f6ed0997f270925b;hb=9f899928ab57fc6c2c6151023190ef8d7c3eac03;hp=93150b6a5d3f4870187251071d4dfabf2bdeff2c;hpb=2b0cd1ba5dbf194bd5ed35964c0cb2ea16293be4;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 93150b6..ebdd9c0 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
@@ -16,6 +16,14 @@ import javax.annotation.CheckForNull;
 
 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 int slot;
     public final int gameMode;
@@ -23,7 +31,7 @@ public class Player extends Mob {
     public float headRotation = 0f;
 
     public Player() {
-        super(0, 0, 4, 30, randomDir(), Type.MOB);
+        super(0, 0, 4, 30, randomDir(), Type.MOB, MAX_HEALTH);
         this.gameMode = 1;
         inventory = new int[9];
         swim = false;
@@ -35,6 +43,7 @@ public class Player extends Mob {
         this.y = pos.y;
         mVelocity.setZero();
         mDead = false;
+        heal(MAX_HEALTH);
     }
 
     public void pickUpDrop(Drop drop) {
@@ -68,6 +77,16 @@ public class Player extends Mob {
         }
     }
 
+    @Override
+    public float getSpeed() {
+        return SPEED;
+    }
+
+    @Override
+    public void jump() {
+        mVelocity.y = JUMP_VELOCITY;
+    }
+
     @Override
     public void ai(GameWorld gameWorld, float delta) {
     }
@@ -76,7 +95,23 @@ public class Player extends Mob {
     public void changeDir() {
     }
 
-    private void drawItem(SpriteBatch spriteBatch, float x, float y) {
+    @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);
+    }
+
+    private void drawItem(SpriteBatch spriteBatch, float x, float y, float anim) {
         final int itemId = inventory[slot];
         final Item item = GameItems.getItem(itemId);
 
@@ -95,14 +130,14 @@ public class Player extends Mob {
         final float handLength = Assets.playerSprite[0][2].getHeight();
 
         final SpriteOrigin spriteOrigin = item.getDefaultOrigin();
-        final int handMultiplier = 1 + -2 * dirMultiplier();
-        final float xOffset = (-1 + dirMultiplier()) * sprite.getWidth() + 4 + handMultiplier * (sprite.getWidth() * spriteOrigin.getX());
+        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;
 
-        float rotate = mAnim + 30;
+        float rotate = anim + 30;
 
-        final float itemX = x + handLength * MathUtils.sin(handMultiplier * mAnim * MathUtils.degRad) + xOffset;
-        final float itemY = y + handLength * MathUtils.cos(handMultiplier * mAnim * MathUtils.degRad) + yOffset;
+        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());
@@ -112,7 +147,7 @@ public class Player extends Mob {
             SpriteUtilsKt.applyOrigin(sprite, spriteOrigin);
         }
 
-        SpriteUtilsKt.draw(spriteBatch, sprite, itemX, itemY, -handMultiplier * rotate);
+        SpriteUtilsKt.drawSprite(spriteBatch, sprite, itemX, itemY, -handMultiplier * rotate);
 
         // dont forget to reset
         sprite.setFlip(false, sprite.isFlipY());
@@ -120,6 +155,42 @@ public class Player extends Mob {
         sprite.setOriginCenter();
     }
 
+    public void startHitting() {
+        if (hitting) {
+            return;
+        }
+
+        hitting = true;
+        hitAnim = 90f;
+        hitAnimDelta = ANIMATION_SPEED;
+    }
+
+    public void stopHitting() {
+        hitting = false;
+    }
+
+    private float getRightHandAnim(float delta) {
+        hitAnim -= hitAnimDelta * delta;
+
+        if (hitAnim < 30f || hitAnim > 90f) {
+            if (hitting) {
+                hitAnimDelta = -hitAnimDelta;
+            } else  {
+                hitAnimDelta = ANIMATION_SPEED;
+            }
+        }
+
+        if (!hitting) {
+            if (hitAnim < hitAnimDelta * delta) {
+                hitAnim = 0;
+                hitAnimDelta = 0;
+                return -mAnim;
+            }
+        }
+
+        return hitAnim;
+    }
+
     @Override
     public void draw(SpriteBatch spriteBatch, float x, float y, float delta) {
         updateAnimation(delta);
@@ -127,26 +198,38 @@ public class Player extends Mob {
         final Sprite backHand = Assets.playerSprite[1][2];
         final Sprite backLeg = Assets.playerSprite[1][3];
         final Sprite frontLeg = Assets.playerSprite[0][3];
-        final Sprite head = Assets.playerSprite[dirMultiplier()][0];
-        final Sprite body = Assets.playerSprite[dirMultiplier()][1];
+        final Sprite head = Assets.playerSprite[getDirection().getIndex()][0];
+        final Sprite body = Assets.playerSprite[getDirection().getIndex()][1];
         final Sprite frontHand = Assets.playerSprite[0][2];
 
-        SpriteUtilsKt.draw(spriteBatch, backHand, x + 2, y + 8, -mAnim);
+        float backHandAnim, frontHandAnim;
+
+        final float rightHandAnim = getRightHandAnim(delta);
+
+        if (looksLeft()) {
+            backHandAnim = rightHandAnim;
+            frontHandAnim = mAnim;
+        } else {
+            backHandAnim = -mAnim;
+            frontHandAnim = -rightHandAnim;
+        }
+
+        SpriteUtilsKt.drawSprite(spriteBatch, backHand, x + 2, y + 8, backHandAnim);
 
         if (looksLeft()) {
-            drawItem(spriteBatch, x, y);
+            drawItem(spriteBatch, x, y, -backHandAnim);
         }
 
-        SpriteUtilsKt.draw(spriteBatch, backLeg, x + 2, y + 20, mAnim);
-        SpriteUtilsKt.draw(spriteBatch, frontLeg, x + 2, y + 20, -mAnim);
-        SpriteUtilsKt.draw(spriteBatch, head, x, y, headRotation);
-        SpriteUtilsKt.draw(spriteBatch, body, x + 2, y + 8);
+        SpriteUtilsKt.drawSprite(spriteBatch, backLeg, x + 2, y + 20, mAnim);
+        SpriteUtilsKt.drawSprite(spriteBatch, frontLeg, x + 2, y + 20, -mAnim);
+        SpriteUtilsKt.drawSprite(spriteBatch, head, x, y, headRotation);
+        SpriteUtilsKt.drawSprite(spriteBatch, body, x + 2, y + 8);
 
         if (looksRight()) {
-            drawItem(spriteBatch, x, y);
+            drawItem(spriteBatch, x, y, frontHandAnim);
         }
 
-        SpriteUtilsKt.draw(spriteBatch, frontHand, x + 2, y + 8, mAnim);
+        SpriteUtilsKt.drawSprite(spriteBatch, frontHand, x + 2, y + 8, frontHandAnim);
     }
 
 }