From 4973d152658133dfb9d297803b456d70f6289274 Mon Sep 17 00:00:00 2001
From: Jan Ehehalt <GammelJAN>
Date: Wed, 24 Jun 2020 10:07:47 +0200
Subject: [PATCH] Lol

---
 core/src/controller/Controller.java                |  4 ++--
 core/src/view/Gamescreen.java                      | 14 +++++++-------
 .../throwgame/main/desktop/DesktopLauncher.java    |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/core/src/controller/Controller.java b/core/src/controller/Controller.java
index 99ef99a..a3e6647 100644
--- a/core/src/controller/Controller.java
+++ b/core/src/controller/Controller.java
@@ -187,9 +187,9 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
                                     collision = true;
                                     level.get(currentChapter).get(currentLevel).getProjectile().setxPos(tempX);
                                     level.get(currentChapter).get(currentLevel).getProjectile().setyPos(tempY);
-                                    if (rect.getHeight() == 1) {
+                                    if (rect.getHeight() == 5) {
                                         level.get(currentChapter).get(currentLevel).horizontalCollision();
-                                    } else if (rect.getWidth() == 1) {
+                                    } else if (rect.getWidth() == 5) {
                                         level.get(currentChapter).get(currentLevel).verticalCollision();
                                     }
                                     //break;
diff --git a/core/src/view/Gamescreen.java b/core/src/view/Gamescreen.java
index d5d450f..582d01c 100644
--- a/core/src/view/Gamescreen.java
+++ b/core/src/view/Gamescreen.java
@@ -87,11 +87,12 @@ public class Gamescreen{
         goalRects[6] = new Rectangle(x + w-1        ,y              ,1          ,h         );
         goalRects[7] = new Rectangle(x              ,y              ,w          ,1         );
 
+        int hitboxWidth = 5;        // CHANGE IN STEP TIMER IN CONTROLLER TOO
         for (Rectangle object : objects) {
-            objectRects.add(new Rectangle(object.getX(), object.getY(), 1, object.getHeight()));
-            objectRects.add(new Rectangle(object.getX(), object.getY() + object.getHeight() - 1, object.getWidth(), 1));
-            objectRects.add(new Rectangle(object.getX() + object.getWidth() - 1, object.getY(), 1, object.getHeight()));
-            objectRects.add(new Rectangle(object.getX(), object.getY(), object.getWidth(), 1));
+            objectRects.add(new Rectangle(object.getX(), object.getY(), hitboxWidth, object.getHeight()));
+            objectRects.add(new Rectangle(object.getX(), object.getY() + object.getHeight() - hitboxWidth, object.getWidth(), hitboxWidth));
+            objectRects.add(new Rectangle(object.getX() + object.getWidth() - hitboxWidth, object.getY(), hitboxWidth, object.getHeight()));
+            objectRects.add(new Rectangle(object.getX(), object.getY(), object.getWidth(), hitboxWidth));
         }
         
         goalRect = new Rectangle(x + w*th, y + h*th, w * th * 3, h * 0.1f);
@@ -134,7 +135,6 @@ public class Gamescreen{
 
         if(objects != null) {
             for (Rectangle object : objects) {
-
                 shapeRenderer.rect(object.getX(), object.getY(), object.getWidth(), object.getHeight());
             }
         }
@@ -157,13 +157,13 @@ public class Gamescreen{
         shapeRenderer.rect(g.getxPos(), g.getyPos(), g.getSizeX(), g.getSizeY());
         */
         // object hitboxes
-        /*
+
         if(objects != null) {
             for (Rectangle object : objectRects) {
                 shapeRenderer.rect(object.getX(), object.getY(), object.getWidth(), object.getHeight());
             }
         }
-        */
+
         
 
         shapeRenderer.setColor(Color.GRAY);
diff --git a/desktop/src/com/throwgame/main/desktop/DesktopLauncher.java b/desktop/src/com/throwgame/main/desktop/DesktopLauncher.java
index 317337e..fb17219 100644
--- a/desktop/src/com/throwgame/main/desktop/DesktopLauncher.java
+++ b/desktop/src/com/throwgame/main/desktop/DesktopLauncher.java
@@ -8,9 +8,9 @@ import controller.Controller;
 public class DesktopLauncher {
 	public static void main (String[] arg) {
 		LwjglApplicationConfiguration config = new LwjglApplicationConfiguration();
-                config.fullscreen = true;
-                config.height = 2560;
-                config.width = 3840;
+                config.fullscreen = false;
+                config.height = 480;
+                config.width = 720;
 		new LwjglApplication(new Controller(), config);
 	}
 }