From fcfc3440863911ac98be32b626100aa1a2d4362b Mon Sep 17 00:00:00 2001
From: GammelJAN <jan.ehehalt@gmail.com>
Date: Sun, 20 Dec 2020 13:21:55 +0100
Subject: [PATCH] movement changes

---
 core/src/com/trs/main/Player.java | 131 ++++++++++++++----------------
 1 file changed, 62 insertions(+), 69 deletions(-)

diff --git a/core/src/com/trs/main/Player.java b/core/src/com/trs/main/Player.java
index 1a106f8..95062f4 100644
--- a/core/src/com/trs/main/Player.java
+++ b/core/src/com/trs/main/Player.java
@@ -29,6 +29,7 @@ public class Player extends Actor{
     float movementX = 0;
     float movementY = 0;
     float speed = 3f;
+    float velocity = 0.2f;
     // 0: up, 1: left, 2: down, 3: right
     int facing = 0;
     
@@ -83,45 +84,27 @@ public class Player extends Actor{
         *   2:  full movement available
         *   3:  no movement available
         */
-        int movementAvailable = getMovementAvailable();
-        switch(movementAvailable){
-            case 0:
-                setY(getY()+movementY);
-                break;
-            case 1:
-                setX(getX()+movementX);
-                break;
-            case 2:
-                Vector2 movement = new Vector2();
-                movement.set(speed, 0);
-                if(movementX > 0 && movementY > 0){
-                    movement.setAngleDeg(45);
-                setX(getX()+movement.x);
-                setY(getY()+movement.y);
-                }
-                else if(movementX < 0 && movementY > 0){
-                    movement.setAngleDeg(135);
-                setX(getX()+movement.x);
-                setY(getY()+movement.y);
-                }
-                else if(movementX > 0 && movementY < 0){
-                    movement.setAngleDeg(315);
-                setX(getX()+movement.x);
-                setY(getY()+movement.y);
-                }
-                else if(movementX < 0 && movementY < 0){
-                    movement.setAngleDeg(225);
-                setX(getX()+movement.x);
-                setY(getY()+movement.y);
-                }
-                else{
-                    setX(getX()+movementX);
-                    setY(getY()+movementY);
-                }
-                
-                break;
-            case 3:
-                break;
+        if(movementX == 0 && movementY == 0){
+        }
+        else if(movementX == 0 && movementY != 0){
+            setY(getY()+movementY);
+            if(collidingWithMapCollisionObject()){
+                setY(getY()-movementY);
+            }
+        }
+        else if(movementY == 0 && movementX != 0){
+            setX(getX()+movementX);
+            if(collidingWithMapCollisionObject()){
+                setX(getX()-movementX);
+            }
+        }
+        else if(movementX != 0 && movementY != 0){
+            setX(getX()+movementX/(float)SQRT2);
+            setY(getY()+movementY/(float)SQRT2);
+            if(collidingWithMapCollisionObject()){
+                setX(getX()-movementX/(float)SQRT2);
+                setY(getY()-movementY/(float)SQRT2);
+            }
         }
         
         int animationRow = 0;
@@ -130,56 +113,66 @@ public class Player extends Actor{
         }
         		
         playerSprite.setRow(animationRow + facing);
-        /*
+        velocity(velocity);
+        playerSprite.updateAnimation(delta);
+        super.act(delta); //To change body of generated methods, choose Tools | Templates.
+
+    }
+
+    @Override
+    public void draw(Batch batch, float parentAlpha) {
+        playerSprite.draw(batch);
+        super.draw(batch, parentAlpha); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean remove() {
+        return super.remove(); //To change body of generated methods, choose Tools | Templates.
+    }
+    
+    public boolean collidingWithMapCollisionObject(){
+        boolean  value = false;
+        for(Actor a : getStage().getActors()){
+                if(a.getName().equals("mapobject")){
+                    Rectangle p = new Rectangle(getX(), getY(), getWidth(), getHeight());
+                    Rectangle o = new Rectangle(a.getX(), a.getY(), a.getWidth(), a.getHeight());
+                    if(Intersector.overlaps(p, o)){
+                        value = true;
+                        break;
+                    }
+                }
+        }
+        return value;
+    }   
+    
+    public void velocity(float velocity){
         if(movementX > 0){
-            movementX -= 0.5;
+            movementX -= velocity;
             if(movementX < 0){
                 movementX = 0;
             }
         }
         else if(movementX < 0){
-            movementX += 0.5;
+            movementX += velocity;
             if(movementX > 0){
                 movementX = 0;
             }
         }
         
         if(movementY > 0){
-            movementY -= 0.5;
+            movementY -= velocity;
             if(movementY < 0){
                 movementY = 0;
             }
         }
         else if(movementY < 0){
-            movementY += 0.5;
+            movementY += velocity;
             if(movementY > 0){
                 movementY = 0;
             }
-        }*/
-        movementX = 0;
-        movementY = 0;
-        playerSprite.updateAnimation(delta);
-        super.act(delta); //To change body of generated methods, choose Tools | Templates.
-
-    }
-
-    @Override
-    public void draw(Batch batch, float parentAlpha) {
-        playerSprite.draw(batch);
-        super.draw(batch, parentAlpha); //To change body of generated methods, choose Tools | Templates.
-    }
-
-    @Override
-    public boolean remove() {
-        return super.remove(); //To change body of generated methods, choose Tools | Templates.
+        }
     }
-    /**
-    *   return
-    *   0:  only vertical movement available
-    *   1:  only horizontal movement available
-    *   2:  full movement available
-    *   3:  no movement available
-    */
+    /*
     public int getMovementAvailable(){
         
         boolean canMoveVer = true;
@@ -228,5 +221,5 @@ public class Player extends Actor{
          
         return 3;
     }
-    
+    */
 }