diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java index a2691b8..be94cdd 100644 --- a/core/src/com/dungeoncrawler/control/Controller.java +++ b/core/src/com/dungeoncrawler/control/Controller.java @@ -106,6 +106,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ @Override public void render(){ + //PASSIERT IN MAINMENU if(v != null){ v.render(batch, d.getPlayer() , e); @@ -114,8 +115,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ //PASSIERT IN GAMESCREEN (view) if(m != null){ //ENTITIES - d.getPlayer().setxPos(m.getPlayerSpriteX()); - d.getPlayer().setyPos(m.getPlayerSpriteY()); + if(v == null){ // Position des Players, etc. werden aktualisiert @@ -124,6 +124,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ // Raum, in dem sich der Player jetzt befindet, wird aktualisiert updateRoom(); + // Render methode zum rendern der einzelnen Sprites wird aufgerufen m.render(batch, d.getPlayer(), e, tile, level, posRoom); } @@ -142,11 +143,14 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ MapObjects objects = layers.get(0).getObjects(); System.out.println(objects.getCount()); - float x = d.getPlayer().getxPos() - 3; - float y = d.getPlayer().getyPos() - 3; + float x = d.getPlayer().getxPos(); + float y = d.getPlayer().getyPos(); d.getPlayer().update(); + m.setPlayerSpriteX(d.getPlayer().getxPos()); + m.setPlayerSpriteY(d.getPlayer().getyPos()); + System.out.println("Temp: " + x + " " + y); System.out.println("Player: " + d.getPlayer().getxPos() + " " + d.getPlayer().getyPos()); @@ -154,8 +158,10 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ Rectangle rectangle = rectangleObject.getRectangle(); if(Intersector.overlaps(rectangle, m.getPlayer().getBoundingRectangle())){ + d.getPlayer().setxPos(x); d.getPlayer().setyPos(y); + System.out.println("Es lädt, es laedt, ich will nicht, dass es laedt, wenn es laedt, muss man immer so lange warten!!!!!"); } } diff --git a/core/src/com/dungeoncrawler/model/Entity.java b/core/src/com/dungeoncrawler/model/Entity.java index de6eefc..e7480a4 100644 --- a/core/src/com/dungeoncrawler/model/Entity.java +++ b/core/src/com/dungeoncrawler/model/Entity.java @@ -30,6 +30,10 @@ public abstract class Entity { xPos += movementX; yPos += movementY; } + public void downgrade(){ + xPos -= movementX; + yPos -= movementY; + } public void die(){ } diff --git a/core/src/com/dungeoncrawler/model/entities/Player.java b/core/src/com/dungeoncrawler/model/entities/Player.java index c355e42..6292850 100644 --- a/core/src/com/dungeoncrawler/model/entities/Player.java +++ b/core/src/com/dungeoncrawler/model/entities/Player.java @@ -14,7 +14,7 @@ import com.dungeoncrawler.model.Entity; public class Player extends Entity { public Player() { - super(0, 0, 1); + super(200, 200, 1); this.maxhp = 5*lvl; this.hp = this.maxhp;