X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=sidebyside;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGamePhysics.java;h=6b69faada2470f556265259c5df8f5aa6cda74b7;hb=59ff9326fad76d34cbadd3fa3e4b4984892238a4;hp=cb5b64c844e1ca85886ea58c6269756d669f4f2c;hpb=834fd02f670fddc6857f2b5afabc3ae044143b32;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java b/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java
index cb5b64c..6b69faa 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java
@@ -10,6 +10,7 @@ import ru.deadsoftware.cavedroid.game.mobs.MobsController;
 import ru.deadsoftware.cavedroid.game.mobs.Player;
 import ru.deadsoftware.cavedroid.game.objects.Drop;
 import ru.deadsoftware.cavedroid.game.objects.DropController;
+import ru.deadsoftware.cavedroid.game.world.GameWorld;
 
 import javax.inject.Inject;
 import java.util.Iterator;
@@ -18,9 +19,11 @@ import java.util.Iterator;
 @GameScope
 public class GamePhysics {
 
-    public static final int PL_SPEED = 120;
+    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, .09f);
+    private final Vector2 gravity = new Vector2(0, 444.44f);
 
     private final GameWorld mGameWorld;
     private final MainConfig mMainConfig;
@@ -174,6 +177,14 @@ 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
+            //                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);
+
         } else {
             mob.y += 1;
             mob.setCanJump(checkColl(mob));
@@ -195,21 +206,21 @@ 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) {
-                player.getVelocity().add(gravity);
+            if (!player.isFlyMode() && player.getVelocity().y < PL_TERMINAL_VELOCITY) {
+                player.getVelocity().y += gravity.y * delta;
             }
         }
 
@@ -222,24 +233,24 @@ public class GamePhysics {
         mobXColl(player);
 
         if (mMainConfig.isTouch() && !player.isFlyMode() && player.canJump() && player.getVelocity().x != 0 && checkJump(player)) {
-            player.getVelocity().add(0, -480);
+            player.getVelocity().y = PL_JUMP_VELOCITY;
             player.setCanJump(false);
         }
     }
 
     private void mobPhy(Mob mob, float delta) {
         if (mob.getType() == Mob.Type.MOB && GameItems.isFluid(getBlock(mob))) {
-            if (mob.getVelocity().y > 540) {
-                mob.getVelocity().add(0, -5.4f);
+            if (mob.getVelocity().y > 32f) {
+                mob.getVelocity().y -= mob.getVelocity().y * 32f * delta;
             }
 
-            mob.getVelocity().add(0, -30f);
+            mob.getVelocity().y += PL_JUMP_VELOCITY * delta;
 
-            if (mob.getVelocity().y < -180) {
-                mob.getVelocity().y = -180;
+            if (mob.getVelocity().y < -PL_SPEED) {
+                mob.getVelocity().y = -PL_SPEED;
             }
-        } else if (!mob.isFlyMode() && mob.getVelocity().y < 1080) {
-            mob.getVelocity().add(gravity);
+        } else if (!mob.isFlyMode() && mob.getVelocity().y < PL_TERMINAL_VELOCITY) {
+            mob.getVelocity().y += gravity.y * delta;
         }
 
         mob.y += mob.getVelocity().y * delta;
@@ -253,7 +264,7 @@ public class GamePhysics {
         mobXColl(mob);
 
         if (mob.canJump() && mob.getVelocity().x != 0 && checkJump(mob)) {
-            mob.getVelocity().add(0, -480);
+            mob.getVelocity().y = PL_JUMP_VELOCITY;
             mob.setCanJump(false);
         }
     }