From 40312aaac2ec8bd1247ad5979f7bd1d8e47ecae3 Mon Sep 17 00:00:00 2001
From: fred-boy <fred-boy@protonmail.com>
Date: Thu, 12 Apr 2018 18:42:53 +0700
Subject: [PATCH] Better collision, disable auto jump

---
 .../ru/deadsoftware/cavecraft/GameScreen.java |  7 +++-
 .../cavecraft/game/GamePhysics.java           | 37 +++++++++++--------
 .../deadsoftware/cavecraft/game/GameProc.java |  5 ++-
 .../deadsoftware/cavecraft/game/WorldGen.java |  7 ++++
 .../cavecraft/game/objects/Block.java         | 28 +++++---------
 .../cavecraft/game/objects/Player.java        |  6 ++-
 6 files changed, 51 insertions(+), 39 deletions(-)

diff --git a/core/src/ru/deadsoftware/cavecraft/GameScreen.java b/core/src/ru/deadsoftware/cavecraft/GameScreen.java
index f9f42ea..209d32b 100644
--- a/core/src/ru/deadsoftware/cavecraft/GameScreen.java
+++ b/core/src/ru/deadsoftware/cavecraft/GameScreen.java
@@ -71,7 +71,12 @@ public class GameScreen implements Screen {
 
         @Override
         public boolean keyDown(int keycode) {
-            gameInput.keyDown(keycode);
+            if (keycode == Input.Keys.N) {
+                gameProc = new GameProc();
+                gameInput = new GameInputHandler(gameProc);
+            } else {
+                gameInput.keyDown(keycode);
+            }
             return false;
         }
 
diff --git a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java b/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java
index 2d59d34..c91b176 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java
@@ -1,9 +1,6 @@
 package ru.deadsoftware.cavecraft.game;
 
-import com.badlogic.gdx.math.MathUtils;
-import com.badlogic.gdx.math.Rectangle;
-import com.badlogic.gdx.math.Vector2;
-import com.badlogic.gdx.math.Vector3;
+import com.badlogic.gdx.math.*;
 import ru.deadsoftware.cavecraft.Items;
 import ru.deadsoftware.cavecraft.game.mobs.Mob;
 import ru.deadsoftware.cavecraft.game.objects.Player;
@@ -43,15 +40,25 @@ public class GamePhysics {
     }
 
     private boolean checkColl(Rectangle rect) {
-        int[] bl = new int [6];
-        bl[0] = gameProc.world.getForeMap(((int)(rect.x)/16), ((int)rect.y/16));
-        bl[1] = gameProc.world.getForeMap(((int)(rect.x+rect.width-1)/16), ((int)rect.y/16));
-        bl[2] = gameProc.world.getForeMap(((int)(rect.x)/16), ((int)(rect.y+rect.height/2)/16));
-        bl[3] = gameProc.world.getForeMap(((int)(rect.x+rect.width-1)/16), ((int)(rect.y+rect.height/2)/16));
-        bl[4] = gameProc.world.getForeMap(((int)(rect.x)/16), ((int)(rect.y+rect.height-1)/16));
-        bl[5] = gameProc.world.getForeMap(((int)(rect.x+rect.width-1)/16), ((int)(rect.y+(rect.height-1))/16));
-        for (int b: bl) if (b>0 && Items.BLOCKS.getValueAt(b).collision) {
-            return true;
+        int[] ids = new int[6];
+        ids[0] = gameProc.world.getForeMap(((int)(rect.x)/16), ((int)rect.y/16));
+        ids[1] = gameProc.world.getForeMap(((int)(rect.x+rect.width-1)/16), ((int)rect.y/16));
+        ids[2] = gameProc.world.getForeMap(((int)(rect.x)/16), ((int)(rect.y+rect.height/2)/16));
+        ids[3] = gameProc.world.getForeMap(((int)(rect.x+rect.width-1)/16), ((int)(rect.y+rect.height/2)/16));
+        ids[4] = gameProc.world.getForeMap(((int)(rect.x)/16), ((int)(rect.y+rect.height-1)/16));
+        ids[5] = gameProc.world.getForeMap(((int)(rect.x+rect.width-1)/16), ((int)(rect.y+(rect.height-1))/16));
+        Rectangle[] bl = new Rectangle[6];
+        if (ids[0]>0) bl[0] = Items.BLOCKS.getValueAt(ids[0]).getRect((int)(rect.x)/16,(int)rect.y/16);
+        if (ids[1]>0) bl[1] = Items.BLOCKS.getValueAt(ids[1]).getRect(((int)(rect.x+rect.width-1)/16), ((int)rect.y/16));
+        if (ids[2]>0) bl[2] = Items.BLOCKS.getValueAt(ids[2]).getRect(((int)(rect.x)/16), ((int)(rect.y+rect.height/2)/16));
+        if (ids[3]>0) bl[3] = Items.BLOCKS.getValueAt(ids[3]).getRect(((int)(rect.x+rect.width-1)/16), ((int)(rect.y+rect.height/2)/16));
+        if (ids[4]>0) bl[4] = Items.BLOCKS.getValueAt(ids[4]).getRect(((int)(rect.x)/16), ((int)(rect.y+rect.height-1)/16));
+        if (ids[5]>0) bl[5] = Items.BLOCKS.getValueAt(ids[5]).getRect(((int)(rect.x+rect.width-1)/16), ((int)(rect.y+(rect.height-1))/16));
+        for (int i=0; i<6; i++) {
+            if (ids[i]>0 &&
+                    Items.BLOCKS.getValueAt(ids[i]).collision &&
+                    Intersector.overlaps(rect,bl[i]))
+                return true;
         }
         return false;
     }
@@ -81,10 +88,10 @@ public class GamePhysics {
             while (checkColl(pl.getRect())) pl.position.x+=d;
         }
 
-        if (checkJump(pl.getRect(), pl.dir) && !pl.flyMode && pl.canJump && !pl.moveX.equals(Vector2.Zero)) {
+        /*if (checkJump(pl.getRect(), pl.dir) && !pl.flyMode && pl.canJump && !pl.moveX.equals(Vector2.Zero)) {
             pl.moveY.add(0, -8);
             pl.canJump = false;
-        }
+        }*/
     }
 
     private void mobPhy(Mob mob) {
diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameProc.java b/core/src/ru/deadsoftware/cavecraft/game/GameProc.java
index fd6d0fe..b955d23 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameProc.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameProc.java
@@ -1,5 +1,6 @@
 package ru.deadsoftware.cavecraft.game;
 
+import com.badlogic.gdx.math.RandomXS128;
 import com.badlogic.gdx.utils.Array;
 import com.badlogic.gdx.utils.TimeUtils;
 import ru.deadsoftware.cavecraft.game.mobs.Human;
@@ -27,10 +28,10 @@ public class GameProc {
     public long touchDownTime;
 
     public GameProc() {
-        world = new GameWorld(512,256);
+        world = new GameWorld(4096,256);
         renderer = new GameRenderer(this);
         physics = new GamePhysics(this);
-        player = new Player();
+        player = new Player(world.getWidth()/2*16+4, 0);
         mobs = new Array<Mob>();
 
     }
diff --git a/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java b/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java
index 7e676f8..6c09cf6 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java
@@ -1,5 +1,6 @@
 package ru.deadsoftware.cavecraft.game;
 
+import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.math.RandomXS128;
 import com.badlogic.gdx.utils.TimeUtils;
 
@@ -56,6 +57,12 @@ public class WorldGen {
                     backMap[x][y] = 7;
                 }
             }
+            for (int y = height/2; y<height- hMap[x]; y++) {
+                if (foreMap[x][y]==0){
+                    foreMap[x][y] = 8;
+                    backMap[x][y] = 8;
+                }
+            }
         }
     }
 
diff --git a/core/src/ru/deadsoftware/cavecraft/game/objects/Block.java b/core/src/ru/deadsoftware/cavecraft/game/objects/Block.java
index 77810e9..a1696f6 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/objects/Block.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/objects/Block.java
@@ -5,7 +5,7 @@ import com.badlogic.gdx.math.Rectangle;
 
 public class Block {
 
-    private Rectangle rect;
+    private int x,y,w,h;
     private TextureRegion texture;
 
     public boolean collision, foreground;
@@ -15,7 +15,10 @@ public class Block {
     }
 
     public Block(int x, int y, int w, int h, TextureRegion texture, boolean collision, boolean foreground) {
-        rect = new Rectangle(x,y,w,h);
+        this.x = x;
+        this.y = y;
+        this.w = w;
+        this.h = h;
         this.texture = texture;
         this.collision = collision;
         this.foreground = foreground;
@@ -25,23 +28,10 @@ public class Block {
         return texture;
     }
 
-    public Rectangle getRect() {
-        return rect;
+    public Rectangle getRect(int x, int y) {
+        x*=16;
+        y*=16;
+        return new Rectangle(x+this.x, y+this.y, w, h);
     }
 
-    public int getX() {
-        return (int)rect.x;
-    }
-
-    public int getY() {
-        return (int)rect.y;
-    }
-
-    public int getWidth() {
-        return (int)rect.width;
-    }
-
-    public int getHeight() {
-        return (int)rect.height;
-    }
 }
diff --git a/core/src/ru/deadsoftware/cavecraft/game/objects/Player.java b/core/src/ru/deadsoftware/cavecraft/game/objects/Player.java
index 1818869..bcebde6 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/objects/Player.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/objects/Player.java
@@ -1,8 +1,10 @@
 package ru.deadsoftware.cavecraft.game.objects;
 
+import com.badlogic.gdx.math.RandomXS128;
 import com.badlogic.gdx.math.Rectangle;
 import com.badlogic.gdx.math.Vector2;
 import ru.deadsoftware.cavecraft.Assets;
+import ru.deadsoftware.cavecraft.game.WorldGen;
 
 public class Player {
 
@@ -13,8 +15,8 @@ public class Player {
     public int[] inventory;
     public boolean flyMode = false;
 
-    public Player() {
-        position = new Vector2(0, 0);
+    public Player(int x, int y) {
+        position = new Vector2(x, y);
         moveX = new Vector2(0, 0);
         moveY = new Vector2(0, 0);
         width = 4;
-- 
2.29.2