GammelJan 6 years ago
parent 44ecf35888
commit a03f5c221c

@ -8,6 +8,7 @@ package controller;
import com.badlogic.gdx.ApplicationAdapter;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.InputProcessor;
import com.badlogic.gdx.Preferences;
import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
@ -46,7 +47,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
boolean isColliding;
Level[] level;
int currentLevel;
int beatenLevel = 0;
int beatenLevel = 9;
OrthographicCamera camera;
@ -56,6 +57,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
@Override
public void create(){
ts = new Titlescreen(GAME_WORLD_WIDTH, GAME_WORLD_HEIGHT);
ls = null;
@ -164,8 +166,8 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
batch.setProjectionMatrix(camera.combined);
if(ts != null) ts.render(batch);
else if(ls != null){
ls.render(batch, level[currentLevel]);
currentLevel = ls.getSelectedLevel();
ls.render(batch, level[currentLevel]);
}
else if(gs != null){
gs.render(batch, level[currentLevel]);
@ -173,7 +175,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
gs.dispose();
stepTimer.stop();
level[currentLevel].reset();
if(currentLevel == beatenLevel)beatenLevel++;
if(currentLevel == beatenLevel && currentLevel < levelAmount)beatenLevel++;
gs = null;
ws = new Winscreen(GAME_WORLD_WIDTH, GAME_WORLD_HEIGHT, true, currentLevel);
}
@ -215,7 +217,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
if(ls.getSelectedLevel() > 0)ls.setSelectedLevel(ls.getSelectedLevel()-1);
}
else if(x > Gdx.graphics.getWidth() * 0.85){
if(ls.getSelectedLevel() < beatenLevel)
if(ls.getSelectedLevel() < beatenLevel && beatenLevel <= levelAmount)
ls.setSelectedLevel(ls.getSelectedLevel()+1);
}
else{

@ -0,0 +1,26 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package save;
/**
*
* @author Jan
*/
public class GameData {
private int beatenLevel;
public int getBeatenLevel(){
return beatenLevel;
}
public void setBeatenLevel(int beatenLevel){
this.beatenLevel = beatenLevel;
}
}

@ -67,8 +67,8 @@ public class Levelscreen{
FreeTypeFontGenerator generator = new FreeTypeFontGenerator(Gdx.files.internal("font.ttf"));
FreeTypeFontGenerator.FreeTypeFontParameter parameter = new FreeTypeFontGenerator.FreeTypeFontParameter();
parameter.size = 21;
font = generator.generateFont(parameter); // font size 12 pixels
generator.dispose(); // don't forget to dispose to avoid memory leaks!
font = generator.generateFont(parameter);
generator.dispose();
font.setColor(Color.BLACK);

@ -58,7 +58,7 @@ public class Winscreen{
font.setColor(Color.BLACK);
movementWin = true;
winX = GAME_WORLD_WIDTH /2 - getTextWidth("Level win") / 2;
winX = GAME_WORLD_WIDTH /2 - getTextWidth("Level won") / 2;
winY = GAME_WORLD_HEIGHT * 0.85f;
}
@ -99,8 +99,8 @@ public class Winscreen{
reset.draw(batch);
if(win){
font.getData().setScale(8);
winX = GAME_WORLD_WIDTH /2 - getTextWidth("Level win") / 2;
font.draw(batch, "Level win", winX, winY);
winX = GAME_WORLD_WIDTH /2 - getTextWidth("Level won") / 2;
font.draw(batch, "Level won", winX, winY);
}

Loading…
Cancel
Save