From 691b47b29edf3a6c956abe088f20ffd70ba4343b Mon Sep 17 00:00:00 2001
From: GammelJan <jan.ehehalt@gmail.com>
Date: Sun, 17 May 2020 12:07:02 +0200
Subject: [PATCH] alla

---
 core/assets/sprites/doorbottom.png            | Bin 0 -> 1237 bytes
 .../dungeoncrawler/control/Controller.java    |  31 +++++++++++-------
 .../com/dungeoncrawler/view/EndScreen.java    |   7 ++--
 .../com/dungeoncrawler/view/GameScreen.java   |   8 ++++-
 .../com/dungeoncrawler/view/PauseScreen.java  |  15 ++++++---
 5 files changed, 42 insertions(+), 19 deletions(-)
 create mode 100644 core/assets/sprites/doorbottom.png

diff --git a/core/assets/sprites/doorbottom.png b/core/assets/sprites/doorbottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..30f5b96892f79148747a8d1cddeb477386a5ee6d
GIT binary patch
literal 1237
zcmV;`1S<Q9P)<h;3K|Lk000e1NJLTq00H0t001xu1^@s6$(^YV0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iTT6>nMC>3cn4vmZ5EXHhDi*;)X)CnqU~=gfG-*gu
zTpR`0f`cE6RR<SmT^(EnLGS~_$<ayCMN0f%QfLw5!Ery{-Fw`<1H6q2Q;e<&Kv7LS
z6^{wo+^P_Gg&%zgVgy4XGqgl{F$34}bq^0;@1i`*{oJ3UN6s4z@Cd|nOw&!`4dR(i
zQ{%i(9A+g^CO#(~*Xe@9k6f1=e&bxU*~>G-dL}hb93~cu9V~S)E9naHG;u^$RLb{e
z9hNz7aaJld*19KuVJNSzq`6LW7;!8ifg}V-sG*DsOhjo_NimS3{g{h?(Do<EC6TKP
zMvetkp+L0#;D7MDTca>F=_G|>fd9p^K1PASF3_x7*7vbxHBSKFGjOH0{nZ9A`$>Ae
ztwoN2-fiIGx~)ljz~v4w@T7^lXiGkt-a-L*KcjET0sXf?_nOmNYagc%K!&<nz5xyn
zfw3ZGue-cE*xB2^XIlOJ0A>_&qR;@!y#N3J24YJ`L;%_VkN|z@p=tI2000SaNLh0L
z04^f{04^f|c%?sf00007bV*G`2jm422p}h4*^JKs000?uMObu0Z*6U5Zgc=ca%Ew3
zWn>_CX>@2HM@dakSAh-}00084Nkl<Zc-rmUU2ftq6b4WSv5u?;R+4pPCD{!Nfq9uo
zOa`j9wAi0>jx<v7yxh78pRe;Xlv2txO}FybJkP`WbILdXq#5o*?LOR6#{CHahz#H!
zI$#|<0BH`U007?axE*-3)!X7Y0CW|=DO<Pz&{Y7Z)4>BEfGg0!0}vU&I!FMh5WqUf
z_wyJPfB^0)%n~~I?f*~HbbIvTkygi@LIB^>-E+Y6JP+%?mdBrUlI!P`aR3A`0K_<&
zg0{E`4q&GNECA|Cy$SBwHQ|(Tfa(G4E@-~nv9CXGZ`x{k++PrACV+bi1ReZ)I`&5k
zrj&620sMo3klevrKmZ6}EFdf(00b}=5bhxWIu2kR3;<LJU|XOT5CBvN;B>Y?0T94^
zS$YSbTE7>G00MaD(mVLH`n^a5XeNMNLuGFZ9xoCBnh0RmPywJq0H@Qzv$x}?<%RNR
z#z6pgLI*FvUReMoU&CHMZ?~&k9`_ZD07iiAG{AaTaHe0w*1;oy(ZTEB0qO;?Yp7rc
z#rX>r0@$l4eE|uu+~da%O5J0or>*s*O8}`a(m9Ufcw3gGlv2w1e2zHamt`sAINt6*
zuk|M!Kp)kgKL3s%$ImPCpRfSxeg0d&iEmr~I+pk%oniZn006)5U<v@>{r<TIe7RgA
zZmoaTwWrsgv<0eu^{fB?`V*+XzV)~|ri4~v(0;c5w3|~t`l3v)Kj9jr`EPgr6UNow
z&P|A(1BM4H)07j~{F{GrxdsdX73hE)ll~m4=df}9I)9zN0yt9o7Mv|a0kG!<kn^{0
z{b|R)00seI0fgh<O;`?^#Bm*@4$}O?*9l<IL7IQ_j{rsoqk{niFz8@lM+;E(zqkJ3
zbUIb}QaT)7e+2n@y;eKX)UST^t6%-<f2ICE2fDcv!Mf_n00000NkvXXu0mjfH0mWl

literal 0
HcmV?d00001

diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java
index d365eb2..a1c32ab 100644
--- a/core/src/com/dungeoncrawler/control/Controller.java
+++ b/core/src/com/dungeoncrawler/control/Controller.java
@@ -64,10 +64,13 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
     
     int playerSkin;
     
-    
+    boolean checkDoor;
     
     @Override
     public void create(){
+        
+        checkDoor = false;
+        
         playerSkin = 0;
         isPaused = false;
         
@@ -286,6 +289,9 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
     public void render(){
         
         //PASSIERT IN MAINMENU
+        if(es != null){
+            es.render(batch, volume, gs.getCamera());
+        }
         if(mm != null){
             mm.render(batch);
         }
@@ -296,14 +302,11 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
             cs.render(batch);
         }
         if(ps != null){
-            ps.render(batch, volume);
-        }
-        if(es != null){
-            es.render(batch, volume);
+            ps.render(batch, volume, gs.getCamera());
         }
         
         //PASSIERT IN GAMESCREEN
-        if(gs != null && mm == null && isPaused == false){
+        if(gs != null && mm == null && isPaused == false && es == null){
             
                 float tempX = d.getPlayer().getxPos();
                 float tempY = d.getPlayer().getyPos();
@@ -372,7 +375,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
             }
         }
         
-        if(hasEnemies()){
+        if(hasEnemies() && checkDoor){
             for(RectangleMapObject rectangleObject : door.getByType(RectangleMapObject.class)){
                 Rectangle tempDoor = rectangleObject.getRectangle();
 
@@ -404,7 +407,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
             }
         }
         
-        if(hasEnemies()){
+        if(hasEnemies() && checkDoor){
             for(RectangleMapObject rectangleObject : door.getByType(RectangleMapObject.class)){
                 Rectangle tempDoor = rectangleObject.getRectangle();
 
@@ -489,7 +492,8 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
             }
             else{ // Dungeon Exit
                 es = new EndScreen();
-                gs = null;
+                gs.stop();
+                entityMovement.stop();
                 
                 return;
             }
@@ -865,7 +869,6 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
                 }
                 return true;
             case 11:
-                create();
                 break;
         }
           
@@ -879,6 +882,9 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
     }
 
     public int click(int x, int y){
+        if(ps != null){
+            return ps.click(x,y);
+        }
         if(mm != null && mm.getHidden() ==  false){
             return mm.click(x, y);
         }
@@ -890,6 +896,9 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
         }
         if(gs != null && isPaused == true){
         
+        }
+        if(es != null){
+        
         }
         return -1;
     }
@@ -925,8 +934,8 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
     }
     
     public void stop(){
-        entityMovement.stop();
         isPaused = true;
+        entityMovement.stop();
         gs.stop();
         
         ps = new PauseScreen();
diff --git a/core/src/com/dungeoncrawler/view/EndScreen.java b/core/src/com/dungeoncrawler/view/EndScreen.java
index 9e9b0f2..813db6f 100644
--- a/core/src/com/dungeoncrawler/view/EndScreen.java
+++ b/core/src/com/dungeoncrawler/view/EndScreen.java
@@ -7,6 +7,7 @@ package com.dungeoncrawler.view;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.GL20;
+import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.Sprite;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
@@ -28,11 +29,13 @@ public class EndScreen {
         backButton.setPosition(100, 100);
     }
         
-    public void render (SpriteBatch batch, float volume) {
+    public void render (SpriteBatch batch, float volume, OrthographicCamera camera) {
 		Gdx.gl.glClearColor(0, 0, 0, 1);
 		Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
                 
                 batch.begin();
+                camera.update();
+                batch.setProjectionMatrix(camera.combined);
                 backButton.draw(batch);
                 batch.end();
 	}
@@ -43,7 +46,7 @@ public class EndScreen {
             if(Intersector.overlaps(r, backButton.getBoundingRectangle())){
                 return 11;   //NEUSTART
             }
-            return 11;
+            return -1;
             //return -1;
             
     }
diff --git a/core/src/com/dungeoncrawler/view/GameScreen.java b/core/src/com/dungeoncrawler/view/GameScreen.java
index 1e8c13a..54f03d5 100644
--- a/core/src/com/dungeoncrawler/view/GameScreen.java
+++ b/core/src/com/dungeoncrawler/view/GameScreen.java
@@ -443,9 +443,12 @@ public class GameScreen {
         public void stop(){
             animations.stop();
             animatePlayer.stop();
-            camera.normalizeUp();
+            camera.zoom = 1600;
+            camera.translate(-175f, -215f);
         }
         public void resume(){
+            camera.zoom = 700;
+            camera.translate(175f, 215f);
             animations.start();
             animatePlayer.start();
         }
@@ -458,5 +461,8 @@ public class GameScreen {
                 }
             }
         }
+        public OrthographicCamera getCamera(){
+            return camera;
+        }
        
 }
diff --git a/core/src/com/dungeoncrawler/view/PauseScreen.java b/core/src/com/dungeoncrawler/view/PauseScreen.java
index 02c4b1c..ba29456 100644
--- a/core/src/com/dungeoncrawler/view/PauseScreen.java
+++ b/core/src/com/dungeoncrawler/view/PauseScreen.java
@@ -9,6 +9,7 @@ import com.badlogic.gdx.Game;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Input;
 import com.badlogic.gdx.graphics.GL20;
+import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.Sprite;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
@@ -57,7 +58,7 @@ public class PauseScreen{
     }
     
     
-    public void render (SpriteBatch batch, float volume) {
+    public void render (SpriteBatch batch, float volume, OrthographicCamera camera) {
 		Gdx.gl.glClearColor(0, 0, 0, 1);
 		Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
                 
@@ -65,7 +66,8 @@ public class PauseScreen{
                 volumeButtonSprite.setPosition(-140, 150);
                 volumeDownSprite.setPosition(volumeButtonSprite.getX() + 230, volumeButtonSprite.getY()+28);
                 volumeUpSprite.setPosition(volumeButtonSprite.getX() + 340, volumeButtonSprite.getY()+28);
-                backButtonSprite.setPosition(-140, 50);
+                //backButtonSprite.setPosition(-140, 50);
+                backButtonSprite.setPosition(0, 0);
                 
                 
                 float n = 0;
@@ -86,7 +88,10 @@ public class PauseScreen{
                 }
                 
                 
+                
                 batch.begin();
+                camera.update();
+                batch.setProjectionMatrix(camera.combined);
                 volumeButtonSprite.draw(batch);
                 volumeUpSprite.draw(batch);
                 volumeDownSprite.draw(batch);
@@ -101,13 +106,13 @@ public class PauseScreen{
             
         
             Rectangle r = new Rectangle();
-            r.set(x, h-y, 1, 1);
-            if(Intersector.overlaps(r, backButtonSprite.getBoundingRectangle())){
+            r.set(x, h-y, 1600, 900);
+            /*if(Intersector.overlaps(r, backButtonSprite.getBoundingRectangle())){
                 return 5;   //proceed Game
             }
             if(Intersector.overlaps(r, volumeDownSprite.getBoundingRectangle())){
                 return 9;   //volume DOWN
-            }
+            }*/
             if(Intersector.overlaps(r, volumeUpSprite.getBoundingRectangle())){
                 return 10;   //volume UP
             }