From 6c9a3dd60e8c4cd841fa477354133368467a9eb6 Mon Sep 17 00:00:00 2001
From: Jonathan Hager <jonathan.hager@protonmail.com>
Date: Wed, 30 Dec 2020 11:24:22 +0100
Subject: [PATCH] Doors fixed

---
 core/assets/tiledmapData/maps/map2.tmx           | 16 ++++++++--------
 core/src/com/trs/main/MapContainer.java          |  2 +-
 core/src/com/trs/main/Player.java                |  2 ++
 .../com/trs/main/view/screens/GameScreen.java    | 10 ++--------
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/core/assets/tiledmapData/maps/map2.tmx b/core/assets/tiledmapData/maps/map2.tmx
index 68299d8..bbf51ed 100644
--- a/core/assets/tiledmapData/maps/map2.tmx
+++ b/core/assets/tiledmapData/maps/map2.tmx
@@ -89,6 +89,14 @@
   <object id="14" x="12.5" y="1" width="363.5" height="7"/>
  </objectgroup>
  <objectgroup id="7" name="DoorRects">
+ <object id="16" x="160" y="311.5" width="64" height="9">
+   <properties>
+    <property name="destinationDoor" type="int" value="1"/>
+    <property name="destinationMap" type="int" value="1"/>
+    <property name="exit" type="int" value="0"/>
+    <property name="id" type="int" value="0"/>
+   </properties>
+  </object>
   <object id="15" x="375.5" y="129" width="8" height="63.5">
    <properties>
     <property name="destinationDoor" type="int" value="0"/>
@@ -97,14 +105,6 @@
     <property name="id" type="int" value="1"/>
    </properties>
   </object>
-  <object id="16" x="160" y="311.5" width="64" height="9">
-   <properties>
-    <property name="destinationDoor" type="int" value="1"/>
-    <property name="destinationMap" type="int" value="1"/>
-    <property name="exit" type="int" value="0"/>
-    <property name="id" type="int" value="0"/>
-   </properties>
-  </object>
  </objectgroup>
  <objectgroup id="8" name="InteractionRects">
   <object id="17" x="288" y="96" width="32" height="32">
diff --git a/core/src/com/trs/main/MapContainer.java b/core/src/com/trs/main/MapContainer.java
index 93ca9ea..c863fe9 100644
--- a/core/src/com/trs/main/MapContainer.java
+++ b/core/src/com/trs/main/MapContainer.java
@@ -122,7 +122,7 @@ public class MapContainer {
     	doors = new Door[tempDoors.size()];
     	for(int i = 0; i < doors.length; i++) {
     		doors[i] = tempDoors.get(i);
-    		if(i == inDoor) {
+    		if(doors[i].id == inDoor) {
     			int facing = doors[i].exit;
     			System.out.println(i + " " + inDoor);
     			switch(facing) {
diff --git a/core/src/com/trs/main/Player.java b/core/src/com/trs/main/Player.java
index 14e182d..ebdc21e 100644
--- a/core/src/com/trs/main/Player.java
+++ b/core/src/com/trs/main/Player.java
@@ -159,12 +159,14 @@ public class Player extends Actor{
         playerSprite.updateAnimation(delta);
         super.act(delta); //To change body of generated methods, choose Tools | Templates.
 
+        /*
         System.out.println("--");
         System.out.println(quest.questText);
         quest.updateQuest(getStage().getActors());
         quest.print();
         System.out.println(quest.finished);
         System.out.println("--");
+        */
         
     }
 
diff --git a/core/src/com/trs/main/view/screens/GameScreen.java b/core/src/com/trs/main/view/screens/GameScreen.java
index 2809f91..6c08933 100644
--- a/core/src/com/trs/main/view/screens/GameScreen.java
+++ b/core/src/com/trs/main/view/screens/GameScreen.java
@@ -28,6 +28,7 @@ public class GameScreen extends AbstractScreen{
     public void loadNewMap(int map, int doorId){
     	String filename = "tiledmapData/maps/map" + map + ".tmx";
         this.map = new MapContainer(Main.CAMERA_WIDTH, Main.CAMERA_HEIGHT, this.map.getPlayer(), filename, doorId, map);
+        System.out.println("Doorid: " + doorId);
     }
 
     @Override
@@ -37,14 +38,7 @@ public class GameScreen extends AbstractScreen{
     @Override
     public void render(float f) {
         map.render(f);
-        /*
-        if(Gdx.input.isKeyJustPressed(Input.Keys.NUM_1)){
-            loadNewMap("map.tmx");
-        }
-        if(Gdx.input.isKeyJustPressed(Input.Keys.NUM_2)){
-            loadNewMap("map2.tmx");
-        }
-        */
+        
         if(map.collidingDoor != null) {
         	loadNewMap(map.collidingDoor.destinationMap, map.collidingDoor.destinationDoor);
         }