From 8937f9c91cc7f6ee02005a633030c85290cbaf8b Mon Sep 17 00:00:00 2001
From: GammelJAN <jan.ehehalt@gmail.com>
Date: Wed, 30 Dec 2020 10:35:08 +0100
Subject: [PATCH] Npcs and Player collide now

---
 core/src/com/trs/main/Main.java                       |  4 ++++
 core/src/com/trs/main/MovingNpc.java                  | 10 ++++++++++
 core/src/com/trs/main/Player.java                     |  8 ++++++--
 desktop/src/com/trs/main/desktop/DesktopLauncher.java |  1 +
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/core/src/com/trs/main/Main.java b/core/src/com/trs/main/Main.java
index f8ea88f..6ddbb10 100644
--- a/core/src/com/trs/main/Main.java
+++ b/core/src/com/trs/main/Main.java
@@ -2,6 +2,7 @@ package com.trs.main;
 
 import com.badlogic.gdx.Game;
 import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.Input;
 import com.badlogic.gdx.graphics.GL20;
 import com.trs.main.view.screens.GameScreen;
 import com.trs.main.view.screens.InventoryScreen;
@@ -45,6 +46,9 @@ public class Main extends Game{
 
     @Override
     public void render () {
+        if(Gdx.input.isKeyJustPressed(Input.Keys.ESCAPE)){
+            Gdx.app.exit();
+        }
         Gdx.gl.glClearColor(0f, (0), (0), 1);
         Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
         
diff --git a/core/src/com/trs/main/MovingNpc.java b/core/src/com/trs/main/MovingNpc.java
index 171a2cb..aebe80a 100644
--- a/core/src/com/trs/main/MovingNpc.java
+++ b/core/src/com/trs/main/MovingNpc.java
@@ -217,6 +217,16 @@ public class MovingNpc extends Actor{
                         return true;
                     }
                 }
+                else if(a instanceof MovingNpc && a != this){
+                    if(Intersector.overlaps(collisionRect, ((MovingNpc)a).collisionRect)){
+                        return true;
+                    }
+                }
+                else if(a instanceof Player){
+                    if(Intersector.overlaps(collisionRect, ((Player)a).collisionRect)){
+                        return true;
+                    }
+                }
         }
         return false;
     } 
diff --git a/core/src/com/trs/main/Player.java b/core/src/com/trs/main/Player.java
index ab6dd72..14e182d 100644
--- a/core/src/com/trs/main/Player.java
+++ b/core/src/com/trs/main/Player.java
@@ -45,7 +45,7 @@ public class Player extends Actor{
         
         int[] n = {1, 1};        
         int[] m = {1, 0};
-        quest = new InformationQuest(0, "Sprich mit Folgenden NPCs: (Id, mapId, schonGereded?) !Reihenfolge wichtig!", m, n, false);
+        quest = new InformationQuest(0, "Sprich mit Folgenden NPCs: (Id, mapId, schonGereded?) !Reihenfolge wichtig!", m, n, true);
     }
 
     @Override
@@ -182,12 +182,16 @@ public class Player extends Actor{
     public boolean collidingWithMapCollisionObject(){
         for(Actor a : getStage().getActors()){
                 if(a instanceof MapCollisionObject){
-                    //Rectangle p = new Rectangle(getX(), getY(), getWidth(), getHeight());
                     Rectangle o = new Rectangle(a.getX(), a.getY(), a.getWidth(), a.getHeight());
                     if(Intersector.overlaps(collisionRect, o)){
                         return true;
                     }
                 }
+                else if(a instanceof MovingNpc){
+                    if(Intersector.overlaps(collisionRect, ((MovingNpc)a).collisionRect)){
+                        return true;
+                    }
+                }
         }
         return false;
     }   
diff --git a/desktop/src/com/trs/main/desktop/DesktopLauncher.java b/desktop/src/com/trs/main/desktop/DesktopLauncher.java
index 5df47c5..1c77c14 100644
--- a/desktop/src/com/trs/main/desktop/DesktopLauncher.java
+++ b/desktop/src/com/trs/main/desktop/DesktopLauncher.java
@@ -8,6 +8,7 @@ public class DesktopLauncher {
 	public static void main (String[] arg) {
 		LwjglApplicationConfiguration config = new LwjglApplicationConfiguration();
                 config.resizable = true;
+                
                 config.width=1280;
                 config.height=720;
                 config.fullscreen = false;