Skip to content
Snippets Groups Projects
Commit d1827a40 authored by iiztp's avatar iiztp
Browse files

Merge branch 'sprint2' of https://gitlab.univ-lorraine.fr/amet26u/acl_m1_info into sprint2

parents f31e1af2 df1a63e2
No related branches found
No related tags found
No related merge requests found
......@@ -94,6 +94,7 @@ public class GameScreen implements Screen {
dy = -Constants.PLAYER_SPEED;
}
//Déplacement rapide du personnage (1 dash par seconde maximum)
if(Gdx.input.isKeyPressed(Input.Keys.SPACE)){
if (timeSinceLastDash > 1.0f) {
if(!dash) {
......@@ -279,7 +280,7 @@ public class GameScreen implements Screen {
if(e.isEnemy()){
Enemy enemy = (Enemy) e;
if(enemy.getHealth()>0) {
batch.draw(healthBarEnnemy, enemy.getBody().getPosition().x-10, enemy.getBody().getPosition().y+2, enemy.getHealth(), 1);
batch.draw(healthBarEnnemy, enemy.getBody().getPosition().x-5, enemy.getBody().getPosition().y+2, enemy.getHealth()/2, 1);
}
}
}
......
......@@ -10,7 +10,10 @@ public class Text {
private final BitmapFont police1;
private final BitmapFont police2;
public Text(){ //générer la police
/**
* Génère des polices.
*/
public Text(){
FreeTypeFontGenerator fGen = new FreeTypeFontGenerator(Gdx.files.internal("Comic_Sans_MS_Bold.ttf"));
FreeTypeFontGenerator.FreeTypeFontParameter fParams = new FreeTypeFontGenerator.FreeTypeFontParameter();
fParams.size = 20;
......@@ -21,23 +24,17 @@ public class Text {
police1 = fGen.generateFont(fParams);
police1.setUseIntegerPositions(false);
fParams.size=130;
fParams.color=new Color(1f, 0f, 0f, 0.75f);
fParams.borderColor = Color.BLACK;
fParams.borderWidth = 3;
FreeTypeFontGenerator.FreeTypeFontParameter fParams2 = new FreeTypeFontGenerator.FreeTypeFontParameter();
fParams2.size=130;
fParams2.color=new Color(1f, 0f, 0f, 0.75f);
fParams2.borderColor = Color.BLACK;
fParams2.borderWidth = 3;
police2 = fGen.generateFont(fParams2);
police2 = fGen.generateFont(fParams);
police2.setUseIntegerPositions(false);
fGen.dispose();
}
public void displayText(SpriteBatch spriteBatch, String texte, float x, float y, int larg, int alignt, boolean retLig){
police1.draw(spriteBatch,texte,x,y,larg,alignt,retLig);
}
public void gameOverText(SpriteBatch spriteBatch, float x, float y){
police2.draw(spriteBatch,"GAME OVER",x,y,400,0,true);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment