Fix swimming

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java b/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java
index 7d13744d9260f7cfb86774641ff70e57c0d67930..9149705aefc07f1e97c337164434a93221928d2c 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java
@@ -21,6 +21,7 @@ public class GamePhysics {
 
     public static final float PL_SPEED = 69.072f;
     public static final float PL_JUMP_VELOCITY = -133.332f;
+    public static final float PL_TERMINAL_VELOCITY = 1254.4f;
 
     private final Vector2 gravity = new Vector2(0, 444.44f);
 
@@ -166,6 +167,9 @@ public class GamePhysics {
             if (d == -1) {
                 mob.setCanJump(true);
                 mob.setFlyMode(false);
+
+                int dmg = ((int)Math.max(0f, (((mob.getVelocity().y * mob.getVelocity().y) / (2 * gravity.y)) - 48f) / 16f));
+                if (dmg > 0) System.out.println("Damage: " + dmg);
             }
 
             mob.y = MathUtils.round(mob.getY());
@@ -176,6 +180,12 @@ public class GamePhysics {
 
             mob.getVelocity().y = 0;
 
+
+
+            //todo fall damage
+            // h = (v^2) / 2g
+            // dmg = max(0, (h - 48) / 32) - half of blocks fallen starting from 3 blocks height
+
         } else {
             mob.y += 1;
             mob.setCanJump(checkColl(mob));
@@ -197,20 +207,20 @@ public class GamePhysics {
                 player.swim = true;
             }
             if (!player.swim) {
-                if (!player.isFlyMode() && player.getVelocity().y < 270f) {
-                    player.getVelocity().x += gravity.y / 4;
+                if (!player.isFlyMode() && player.getVelocity().y < 32f) {
+                    player.getVelocity().y += gravity.y * delta;
                 }
-                if (!player.isFlyMode() && player.getVelocity().y > 270f) {
-                    player.getVelocity().add(0, -60f);
+                if (!player.isFlyMode() && player.getVelocity().y > 32f) {
+                    player.getVelocity().y -= player.getVelocity().y * 32f * delta;
                 }
             } else {
-                player.getVelocity().add(0, -30f);
-                if (player.getVelocity().y < -180) {
-                    player.getVelocity().y = -180;
+                player.getVelocity().y += PL_JUMP_VELOCITY * delta;
+                if (player.getVelocity().y < -PL_SPEED) {
+                    player.getVelocity().y = -PL_SPEED;
                 }
             }
         } else {
-            if (!player.isFlyMode() && player.getVelocity().y < 1080) {
+            if (!player.isFlyMode() && player.getVelocity().y < PL_TERMINAL_VELOCITY) {
                 player.getVelocity().y += gravity.y * delta;
             }
         }

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java
index 84cea1be3d19cf995ba6b92d8ee07a11b65663ed..b17777952b1c187ab29a6511b438cdf5b14b16fa 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java
@@ -292,11 +292,13 @@ public class GameRenderer extends Renderer {
             drawString("CurX: " + mGameInput.getCurX(), 0, 30);
             drawString("CurY: " + mGameInput.getCurY(), 0, 40);
             drawString("Velocity: " + player.getVelocity(), 0, 50);
-            drawString("Mobs: " + mMobsController.getSize(), 0, 60);
-            drawString("Drops: " + mDropController.getSize(), 0, 70);
-            drawString("Block: " + GameItems.getBlockKey(mGameWorld.getForeMap(mGameInput.getCurX(), mGameInput.getCurY())), 0, 80);
-            drawString("Hand: " + GameItems.getItemKey(mMobsController.getPlayer().inventory[mMobsController.getPlayer().slot]), 0, 90);
-            drawString("Game mode: " + player.gameMode, 0, 100);
+            drawString("Swim: " + player.swim, 0, 60);
+            drawString("Mobs: " + mMobsController.getSize(), 0, 70);
+            drawString("Drops: " + mDropController.getSize(), 0, 80);
+            drawString("Block: " + GameItems.getBlockKey(mGameWorld.getForeMap(mGameInput.getCurX(), mGameInput.getCurY())), 0, 90);
+            drawString("Hand: " + GameItems.getItemKey(mMobsController.getPlayer().inventory[mMobsController.getPlayer().slot]), 0, 100);
+            drawString("Game mode: " + player.gameMode, 0, 110);
+            drawString("Check swim: " + GameItems.isFluid(mGameWorld.getForeMap(player.getMapX(), player.getLowerMapY())), 0, 120);
             spriter.end();
         }
 

diff --git a/desktop/src/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.java b/desktop/src/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.java
index cc0bb932a0db15561b05e494c12f8ea1f8b6cd19..c30a617f94a6ca016e5029cccb2279d85837657e 100644 (file)
--- a/desktop/src/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.java
+++ b/desktop/src/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.java
@@ -9,10 +9,9 @@ class DesktopLauncher {
        public static void main (String[] arg) {
                Lwjgl3ApplicationConfiguration config = new Lwjgl3ApplicationConfiguration();
                config.setWindowIcon(Files.FileType.Internal, "icons/icon256.png", "icons/icon128.png");
-//             config.setForegroundFPS(144);
         config.setTitle("CaveDroid");
                config.setWindowedMode(960, 540);
-               config.useVsync(false);
+               config.useVsync(true);
 
                boolean touch = false;
                for (String anArg : arg) {