Jonathan Hager 6 years ago
parent d185ec58e2
commit 1c94e4cb55

@ -38,8 +38,6 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
final float GAME_WORLD_WIDTH = 1600; final float GAME_WORLD_WIDTH = 1600;
final float GAME_WORLD_HEIGHT = 900; final float GAME_WORLD_HEIGHT = 900;
File filesDir;
Titlescreen ts; Titlescreen ts;
Levelscreen ls; Levelscreen ls;
Gamescreen gs; Gamescreen gs;
@ -50,6 +48,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
Timer stepTimer; Timer stepTimer;
boolean isColliding; boolean isColliding;
ArrayList<ArrayList<Level>> level; ArrayList<ArrayList<Level>> level;
ArrayList<Level> ownLevels;
int currentLevel; int currentLevel;
int currentChapter; int currentChapter;
int beatenLevel = 9; int beatenLevel = 9;
@ -85,6 +84,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
for(int i = 0; i < 5; i++){ for(int i = 0; i < 5; i++){
level.add(new ArrayList<Level>()); level.add(new ArrayList<Level>());
} }
ownLevels = new ArrayList<>();
currentLevel = 0; currentLevel = 0;
currentChapter = 1; currentChapter = 1;
@ -109,20 +109,30 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
*/ */
FileHandle levelJson; FileHandle directory;
FileHandle[] files;
for(int chapter = 0; chapter < level.size(); chapter++) { for(int chapter = 0; chapter < level.size(); chapter++) {
for (int i = 0; i < 10; i++) {
levelJson = Gdx.files.local("levels/chapter" + chapter + "/level" + i + ".json"); directory = Gdx.files.local("levels/chapter" + (chapter + 1));
//levelJson = Gdx.files.local("levels/level0.json"); files = directory.list();
if (!levelJson.exists()) {
break; for(FileHandle file : files){
} else { if(file.exists()){
Level tempLevel = json.fromJson(Level.class, levelJson.readString()); Level tempLevel = json.fromJson(Level.class, file.readString());
level.get(chapter).add(tempLevel); level.get(chapter).add(tempLevel);
} }
} }
} }
directory = Gdx.files.local("levels/own");
files = directory.list();
for(FileHandle file : files){
if(file.exists()){
Level tempLevel = json.fromJson(Level.class, file.readString());
ownLevels.add(tempLevel);
}
}
stepTimer = new Timer(); stepTimer = new Timer();
stepTimer.scheduleTask(new Timer.Task() { stepTimer.scheduleTask(new Timer.Task() {
@Override @Override
@ -226,10 +236,6 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
} }
public void initContext(File context){
this.filesDir = context;
}
@Override @Override
public boolean keyDown(int keycode) { public boolean keyDown(int keycode) {
camera.translate(5f, 5f); camera.translate(5f, 5f);

Loading…
Cancel
Save