From 59187ff4588c8088f5365a5dafb936f16766979d Mon Sep 17 00:00:00 2001
From: Jonathan Hager <jonathan.hager@protonmail.com>
Date: Sat, 25 Apr 2020 23:08:15 +0200
Subject: [PATCH] =?UTF-8?q?geiler=20schei=C3=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/src/com/dungeoncrawler/control/Controller.java |  2 +-
 core/src/com/dungeoncrawler/view/GameScreen.java    | 13 ++++++++-----
 core/src/com/dungeoncrawler/view/MapGenerator.java  |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java
index a048b75..e16157b 100644
--- a/core/src/com/dungeoncrawler/control/Controller.java
+++ b/core/src/com/dungeoncrawler/control/Controller.java
@@ -61,7 +61,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
         volume = 0.01f;
         
         arrows = new Entity[10];
-        roomX = 8;
+        roomX = 10;
         roomY = 6;
         
         batch = new SpriteBatch();
diff --git a/core/src/com/dungeoncrawler/view/GameScreen.java b/core/src/com/dungeoncrawler/view/GameScreen.java
index 96f5e34..945e00e 100644
--- a/core/src/com/dungeoncrawler/view/GameScreen.java
+++ b/core/src/com/dungeoncrawler/view/GameScreen.java
@@ -18,8 +18,8 @@ import com.dungeoncrawler.model.entities.*;
 
 public class GameScreen {
         //CONTROLS
-        Texture ctr;
-        Sprite controls;
+        //Texture ctr;
+        //Sprite controls;
     
         //PLAYER
         Texture p;
@@ -50,11 +50,12 @@ public class GameScreen {
         
 	public GameScreen(Dungeon d, float volume) {
                 //CONTROLS
+                /*
                 ctr = new Texture("controls.png");
                 controls = new Sprite(ctr);
                 controls.setX(-400f);
                 controls.setY(0);
-            
+                */
             
                 //PLAYER
                 
@@ -80,6 +81,7 @@ public class GameScreen {
                 
                 m = new Map();
                 camera = new OrthographicCamera(1, h/w);
+                camera.translate(300f, 200f);
                 
                 MapGenerator mg = new MapGenerator(new Texture(Gdx.files.internal("tileset_floor_1.png")));
                 
@@ -133,7 +135,8 @@ public class GameScreen {
                 tmr.setView(camera);
                 tmr.render();
 
-                camera.zoom = 1700f;
+                camera.zoom = 700f;
+                
                 camera.update();
                 batch.setProjectionMatrix(camera.combined);
 
@@ -160,7 +163,7 @@ public class GameScreen {
             //BATCH
             batch.begin();
                 player.draw(batch);
-                controls.draw(batch);
+                //controls.draw(batch);
                     //DRAW'T JEDES ENTITY - prueft vorher ob vorhanden
                 for(int i = 0; i < e.length; i++){
                     if(e[i] != null){
diff --git a/core/src/com/dungeoncrawler/view/MapGenerator.java b/core/src/com/dungeoncrawler/view/MapGenerator.java
index 24608a9..56bdac9 100644
--- a/core/src/com/dungeoncrawler/view/MapGenerator.java
+++ b/core/src/com/dungeoncrawler/view/MapGenerator.java
@@ -57,7 +57,7 @@ public class MapGenerator {
                 Room room = l.getRooms()[x][y];
                 
                 if(room != null){
-                    int tempX = 7;
+                    int tempX = 9;
                     int tempY = 5;
                     
                     int mapDimensionX = tempX + 2;