Fehler, welche offentsichtlich unter Drogeneinfluss gemacht wurden, sind behoben

master
Jonathan Hager 6 years ago
parent c2e4d79691
commit 28b54c6908

@ -35,7 +35,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
v = new MainMenu(); v = new MainMenu();
dg = new DungeonGenerator(); dg = new DungeonGenerator();
d = dg.generateDungeon(0, 0, 0, new Player()); d = dg.generateDungeon(0, 0, 0, new Player());
dg.ichWillSpielen(); dg.ichWillSpielen(d);
e = new Entity[5]; e = new Entity[5];
Gdx.input.setInputProcessor(this); Gdx.input.setInputProcessor(this);
t = new Timer(); t = new Timer();
@ -90,7 +90,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
int roomLengthY = d.getLevel()[0].getRooms()[0].length; int roomLengthY = d.getLevel()[0].getRooms()[0].length;
int roomAmount = d.getLevel()[0].getRooms().length; int roomAmount = d.getLevel()[0].getRooms().length;
int startRoom = (int) (Math.random() * roomAmount); int startRoom = (int) (0.5 * roomAmount);//(int) (Math.random() * roomAmount);
int[] posRoom = new int[2]; int[] posRoom = new int[2];
int level = 0; int level = 0;
@ -98,15 +98,17 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
int k = 0; int k = 0;
for(int i = 0; i < roomLengthX; i++){ for(int i = 0; i < roomLengthX; i++){
for(int j = 0; j < roomLengthY; j++){ for(int j = 0; j < roomLengthY; j++){
if(d.getLevel()[level].getRooms()[i][j] != null){
if(d.getLevel()[0].getRooms()[i][j] != null){ if(true){
k++;
if(k == startRoom){
// Startraum wurde ausgewählt // Startraum wurde ausgewählt
posRoom[0] = i; posRoom[0] = i;
posRoom[1] = j; posRoom[1] = j;
System.out.println(i + " " + j);
break;
} }
k++;
} }
} }
@ -165,7 +167,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
if(v.click() == -1){} if(v.click() == -1){}
else if(v.click() == 0){ else if(v.click() == 0){
v = null; v = null;
m = new View(); m = new View(d);
System.out.println("NICE"); System.out.println("NICE");
} }
} }

@ -107,14 +107,13 @@ public class DungeonGenerator {
return position; return position;
} }
public void ichWillSpielen(){ public void ichWillSpielen(Dungeon d){
Dungeon d = this.generateDungeon(200, 200, 200, new Player());
for(int i=0;i<d.getLevel().length;i++){ for(int i=0;i<d.getLevel().length;i++){
Level temp = d.getLevel()[i]; Level temp = d.getLevel()[i];
System.out.println("Level " + i); System.out.println("Level " + i);
for(int j = temp.getRooms().length - 1; j >=0; j--){ for(int j = 0; j < temp.getRooms().length; j++){
for(int k = temp.getRooms().length - 1; k >= 0; k--){ for(int k = temp.getRooms().length - 1; k >= 0; k--){
if(temp.getRooms()[j][k] == null){ if(temp.getRooms()[j][k] == null){

@ -33,7 +33,7 @@ public class Level {
} }
public void setRoom(Room room, int x, int y){ public void setRoom(Room room, int x, int y){
if(x < this.rooms.length){ if(x < this.rooms.length && y < this.rooms.length){
this.rooms[x][y] = room; this.rooms[x][y] = room;
} }
} }

@ -28,7 +28,9 @@ public class MapGenerator {
splitTiles = TextureRegion.split(this.tiles, 48, 48); splitTiles = TextureRegion.split(this.tiles, 48, 48);
} }
public TiledMap[][][] generateMap(int levelAmount, Dungeon d){ public TiledMap[][][] generateMap(Dungeon d){
int levelAmount = d.getLevel().length;
TiledMap[][][] tempMap = new TiledMap[levelAmount][][]; TiledMap[][][] tempMap = new TiledMap[levelAmount][][];
for(int i = 0; i < levelAmount; i++){ for(int i = 0; i < levelAmount; i++){
@ -54,7 +56,7 @@ public class MapGenerator {
int tempY = 5; int tempY = 5;
TiledMap tempRoom = generateRoom(room, tempX, tempY); TiledMap tempRoom = generateRoom(room, tempX, tempY);
/*
// Wenn es Fehler gibt, dann wohl hier: Viel Spaß beim Suchen! Danke! // Wenn es Fehler gibt, dann wohl hier: Viel Spaß beim Suchen! Danke!
TiledMapTileLayer temp = (TiledMapTileLayer) tempRoom.getLayers().get(2); TiledMapTileLayer temp = (TiledMapTileLayer) tempRoom.getLayers().get(2);
@ -76,7 +78,7 @@ public class MapGenerator {
// Ausgang links // Ausgang links
if(x > 0 && l.getRooms()[x - 1][y] != null){ if(x > 0 && l.getRooms()[x - 1][y] != null){
temp.getCell(0, (tempY / 2) + 1).setTile(new StaticTiledMapTile(splitTiles[0][3])); //links temp.getCell(0, (tempY / 2) + 1).setTile(new StaticTiledMapTile(splitTiles[0][3])); //links
} }*/
tempLevel[x][y] = tempRoom; tempLevel[x][y] = tempRoom;
} }
@ -120,4 +122,26 @@ public class MapGenerator {
return tempRoom; return tempRoom;
} }
public void ichWillSpielen(TiledMap[][][] map){
for(int i=0;i<map.length;i++){
TiledMap[][] temp = map[i];
System.out.println("MapLevel " + i);
for(int j = 0; j < temp.length; j++){
for(int k = temp[j].length - 1; k >= 0; k--){
if(temp[j][k] == null){
System.out.print("0 ");
}
else{
System.out.print("1 ");
}
}
System.out.println();
}
}
}
} }

@ -6,13 +6,11 @@ import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.graphics.g2d.Sprite; import com.badlogic.gdx.graphics.g2d.Sprite;
import com.badlogic.gdx.utils.Timer;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.maps.tiled.TiledMap; import com.badlogic.gdx.maps.tiled.TiledMap;
import com.badlogic.gdx.maps.tiled.TiledMapRenderer; import com.badlogic.gdx.maps.tiled.TiledMapRenderer;
import com.badlogic.gdx.maps.tiled.renderers.OrthogonalTiledMapRenderer; import com.badlogic.gdx.maps.tiled.renderers.OrthogonalTiledMapRenderer;
import com.dungeoncrawler.model.Dungeon; import com.dungeoncrawler.model.Dungeon;
import com.dungeoncrawler.model.DungeonGenerator;
import com.dungeoncrawler.model.Entity; import com.dungeoncrawler.model.Entity;
import com.dungeoncrawler.model.entities.*; import com.dungeoncrawler.model.entities.*;
@ -32,9 +30,8 @@ public class View {
TiledMapRenderer tmr; TiledMapRenderer tmr;
TiledMap test; TiledMap test;
OrthographicCamera camera; OrthographicCamera camera;
Dungeon d;
public View() { public View(Dungeon d) {
float w = Gdx.graphics.getWidth(); float w = Gdx.graphics.getWidth();
float h = Gdx.graphics.getHeight(); float h = Gdx.graphics.getHeight();
float wc = w/2; float wc = w/2;
@ -54,10 +51,12 @@ public class View {
//MAP //MAP
m = new Map(); m = new Map();
camera = new OrthographicCamera(1, h/w); camera = new OrthographicCamera(1, h/w);
d = new DungeonGenerator().generateDungeon(10, 10, 48, new Player());
MapGenerator mg = new MapGenerator(new Texture(Gdx.files.internal("tiles.gif"))); MapGenerator mg = new MapGenerator(new Texture(Gdx.files.internal("tiles.gif")));
TiledMap[][][] maps = mg.generateMap(7, d);
TiledMap[][][] maps = mg.generateMap(d);
m.setMaps(maps); m.setMaps(maps);
mg.ichWillSpielen(m.getMaps());
test = new TiledMap(); test = new TiledMap();
tmr = new OrthogonalTiledMapRenderer(test); tmr = new OrthogonalTiledMapRenderer(test);
@ -77,6 +76,13 @@ public class View {
test = m.getMaps()[level][xPosRoom][yPosRoom]; test = m.getMaps()[level][xPosRoom][yPosRoom];
if(test == null){
System.out.println("Dein scheiß geht net");
}
else{
tmr = new OrthogonalTiledMapRenderer(test);
}
if(p.getMovementX() == 3){ if(p.getMovementX() == 3){
player.setRegion(regions[0][1]); player.setRegion(regions[0][1]);
} }

Loading…
Cancel
Save