X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGamePhysics.java;h=5677c2426fa5f8e1ef47e959870ae8dfb0038e38;hb=e7be8067d83f2a39c237ec7afbe115a846a74f3d;hp=1bedc729471a0a022c701bca28c56ebfbb674d04;hpb=c9d399d3ae0b7f797d6fd62a4c22202a12a8825b;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java b/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java
index 1bedc72..5677c24 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java
@@ -1,8 +1,10 @@
 package ru.deadsoftware.cavecraft.game;
 
-import com.badlogic.gdx.math.*;
+import com.badlogic.gdx.math.Intersector;
+import com.badlogic.gdx.math.MathUtils;
+import com.badlogic.gdx.math.Rectangle;
+import com.badlogic.gdx.math.Vector2;
 import ru.deadsoftware.cavecraft.CaveGame;
-import ru.deadsoftware.cavecraft.Items;
 import ru.deadsoftware.cavecraft.game.mobs.Mob;
 import ru.deadsoftware.cavecraft.game.objects.Player;
 
@@ -16,23 +18,25 @@ public class GamePhysics {
 
     public GamePhysics(GameProc gameProc) {
         this.gameProc = gameProc;
-        gravity = new Vector2(0,1);
+        gravity = new Vector2(0,.9f);
     }
 
     private boolean checkJump(Rectangle rect, int dir) {
         int bl = 0;
         switch (dir) {
             case 0:
-                if ((int)((rect.x+(rect.width/2))/16) - 1>=0)
-                    bl = gameProc.world.getForeMap(
-                        (int)((rect.x+(rect.width/2))/16) - 1,
-                        (int)(rect.y/16)+1);
+                bl = gameProc.world.getForeMap(
+                    (int)((rect.x+(rect.width/2))/16) - 1,
+                    (int)(rect.y/16)+1);
+                if (gameProc.world.getForeMap((int)((rect.x+(rect.width/2))/16)-1,(int)(rect.y/16))>0) bl=0;
+                if (gameProc.world.getForeMap((int)((rect.x+(rect.width/2))/16)-1,(int)(rect.y/16)-1)>0) bl=0;
                 break;
             case 1:
-                if ((int)((rect.x+(rect.width/2))/16) + 1<gameProc.world.getWidth())
-                    bl = gameProc.world.getForeMap(
-                        (int)((rect.x+(rect.width/2))/16) + 1,
-                        (int)(rect.y/16)+1);
+                bl = gameProc.world.getForeMap(
+                    (int)((rect.x+(rect.width/2))/16) + 1,
+                    (int)(rect.y/16)+1);
+                if (gameProc.world.getForeMap((int)((rect.x+(rect.width/2))/16)+1,(int)(rect.y/16))>0) bl=0;
+                if (gameProc.world.getForeMap((int)((rect.x+(rect.width/2))/16)+1,(int)(rect.y/16)-1)>0) bl=0;
                 break;
             default:
                 bl=0;
@@ -46,9 +50,7 @@ public class GamePhysics {
         int minY = (int) ((rect.y+rect.height/2)/16)-4;
         int maxX = (int) ((rect.x+rect.width/2)/16)+4;
         int maxY = (int) ((rect.y+rect.height/2)/16)+4;
-        if (minX<0) minX=0;
         if (minY<0) minY=0;
-        if (maxX>gameProc.world.getWidth()) maxX = gameProc.world.getWidth();
         if (maxY>gameProc.world.getHeight()) maxY = gameProc.world.getHeight();
         for (int y=minY; y<maxY; y++) {
             for (int x=minX; x<maxX; x++) {
@@ -66,21 +68,20 @@ public class GamePhysics {
     private void playerPhy(Player pl) {
         pl.position.add(pl.moveY);
         if (checkColl(pl.getRect())) {
-            pl.flyMode = false;
-            pl.canJump = true;
             int d = -1;
             if (pl.moveY.y<0) d=1; else if (pl.moveY.y>0) d=-1;
+            if (d==-1) {
+                pl.flyMode = false;
+                pl.canJump = true;
+            }
             pl.position.y = MathUtils.round(pl.position.y);
             while (checkColl(pl.getRect())) pl.position.y+=d;
             pl.moveY.setZero();
         } else {
             pl.canJump = false;
         }
-        if (!pl.flyMode) pl.moveY.add(gravity);
+        if (!pl.flyMode && pl.moveY.y<18) pl.moveY.add(gravity);
         pl.position.add(pl.moveX);
-        if (pl.position.x<0 ||
-                pl.position.x+pl.texWidth>=gameProc.world.getWidth()*16)
-            pl.position.sub(pl.moveX);
         if (checkColl(pl.getRect())) {
             if (pl.canJump && !pl.flyMode) pl.position.y-=8;
             if (checkColl(pl.getRect())) {
@@ -92,6 +93,8 @@ public class GamePhysics {
                 while (checkColl(pl.getRect())) pl.position.x += d;
             }
         }
+        if (pl.position.x+pl.texWidth/2<0) pl.position.x+=gameProc.world.getWidth()*16;
+        if (pl.position.x+pl.texWidth/2>gameProc.world.getWidth()*16) pl.position.x-=gameProc.world.getWidth()*16;
         if (pl.position.y > gameProc.world.getHeight()*16) {
             pl.position = gameProc.world.getSpawnPoint().cpy();
         }
@@ -115,9 +118,8 @@ public class GamePhysics {
         }
         mob.moveY.add(gravity);
         mob.position.add(mob.moveX);
-        if (mob.position.x<32 ||
-                mob.position.x+mob.width>gameProc.world.getWidth()*16-32)
-            mob.position.sub(mob.moveX);
+        if (mob.position.x+mob.width/2<0) mob.position.x+=gameProc.world.getWidth()*16;
+        if (mob.position.x+mob.width/2>gameProc.world.getWidth()*16) mob.position.x-=gameProc.world.getWidth()*16;
         if (checkColl(mob.getRect())) {
             int d = 0;
             if (mob.moveX.x<0) d=1; else if (mob.moveX.x>0) d=-1;
@@ -127,7 +129,6 @@ public class GamePhysics {
 }
 
     public void update(float delta) {
-
         for (Mob mob : gameProc.mobs) {
             mob.ai();
             mobPhy(mob);