Refactor world generator

[cavedroid.git] / core / src / ru / deadsoftware / cavedroid / game / GamePhysics.java

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java b/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java
index 6b69faada2470f556265259c5df8f5aa6cda74b7..e3ceb531cb3a37c4ac9aec5adf5b6c83152dc838 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java
@@ -96,18 +96,19 @@ public class GamePhysics {
 
     private void dropPhy(Drop drop, float delta) {
         int dropToPlayer = drop.closeToPlayer(mGameWorld, mMobsController.getPlayer());
+
         if (dropToPlayer > 0) {
-            drop.moveToPlayer(mGameWorld, mMobsController.getPlayer(), dropToPlayer);
+            drop.moveToPlayer(mGameWorld, mMobsController.getPlayer(), dropToPlayer, delta);
         } else {
-            if (drop.getVelocity().x >= .5f) {
-                drop.getVelocity().x -= .5f;
-            } else if (drop.getVelocity().x <= -.5f) {
-                drop.getVelocity().x += .5f;
+            if (drop.getVelocity().x >= 300f) {
+                drop.getVelocity().x = 300f;
+            } else if (drop.getVelocity().x <= -300f) {
+                drop.getVelocity().x = -300f;
             } else {
                 drop.getVelocity().x = 0;
             }
-            if (drop.getVelocity().y < 9) {
-                drop.getVelocity().y += gravity.y / 4;
+            if (drop.getVelocity().y < PL_TERMINAL_VELOCITY) {
+                drop.getVelocity().y += gravity.y * delta;
             }
         }
         drop.move(delta);
@@ -116,7 +117,7 @@ public class GamePhysics {
         if (checkColl(drop)) {
             drop.getVelocity().set(0, -1);
             do {
-                drop.move(delta);
+                drop.move(1);
             } while (checkColl(drop));
             drop.getVelocity().setZero();
         }