Nantes Université

Skip to content
Extraits de code Groupes Projets
Valider 6dcee8f9 rédigé par Bryan BARBE's avatar Bryan BARBE
Parcourir les fichiers

clean code

parent 9de48522
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -27,7 +27,6 @@ public class GamePanel extends JPanel implements Runnable{
Thread gameThread;
// Set Player's default position
Player player1 = new Player(75, 75);
Ground game = new Ground(15, 13);
......@@ -84,35 +83,35 @@ public class GamePanel extends JPanel implements Runnable{
public void update(){
//A opti
if(keyH.upPressed == true && !game.collisionTestBLock(player1,0 ,-player1.getSpeed())){
player1.addY(-player1.getSpeed());
if(keyH.upPressed == true && !game.collisionTestBLock(game.players.get(0),0 ,-game.players.get(0).getSpeed())){
game.players.get(0).addY(-game.players.get(0).getSpeed());
}
if(keyH.downPressed == true && !game.collisionTestBLock(player1,0 ,player1.getSpeed())){
player1.addY(player1.getSpeed());
if(keyH.downPressed == true && !game.collisionTestBLock(game.players.get(0),0 ,game.players.get(0).getSpeed())){
game.players.get(0).addY(game.players.get(0).getSpeed());
}
if(keyH.rightPressed == true && !game.collisionTestBLock(player1,player1.getSpeed() ,0 )){
player1.addX(player1.getSpeed());
if(keyH.rightPressed == true && !game.collisionTestBLock(game.players.get(0),game.players.get(0).getSpeed() ,0 )){
game.players.get(0).addX(game.players.get(0).getSpeed());
}
if(keyH.leftPressed == true && !game.collisionTestBLock(player1,-player1.getSpeed() ,0 )){
player1.addX(-player1.getSpeed());
if(keyH.leftPressed == true && !game.collisionTestBLock(game.players.get(0),-game.players.get(0).getSpeed() ,0 )){
game.players.get(0).addX(-game.players.get(0).getSpeed());
}
System.out.println(player1.getGridX() + " " + player1.getGridY());
//System.out.println(game.players.get(0).getGridX() + " " + game.players.get(0).getGridY());
//
if(keyH.enterPressed == true){
player1.placeBomb();
game.addBomb(game.players.get(0));
}
}
public void paintComponent(Graphics g){
super.paintComponent(g);
//Joueur 1
PlayerDisplay p1 = new PlayerDisplay(player1.getX(), player1.getY(), g);
PlayerDisplay p1 = new PlayerDisplay(game.players.get(0).getX(), game.players.get(0).getY(), g);
p1.draw();
// Terrain
......
package App;
import App.Block.*;
import App.Bomb.*;
import java.util.*;
public class Ground {
private Block[][] grid;
private int nbx, nby;
public ArrayList<Bomb> bombs;
public ArrayList<Player> players;
public Ground(int x, int y){
this.nbx = x;
this.nby = y;
this.grid = new Block[x][y];
players = new ArrayList<Player>();
players.add(new Player(75,75));
bombs = new ArrayList<Bomb>();
}
public void newGround(){
for (int j = 0; j < nby; j++){
for(int i = 0; i < nbx; i++){
if( i == 0 || i == nbx - 1 || j == 0 || j == nby - 1){
......@@ -93,4 +99,8 @@ public class Ground {
return grid;
}
public void addBomb(Player p){
bombs.add(p.placeBomb());
System.out.println("Bomb has been planted");
}
}
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter