Resolve conflict

dalek63 · Jan 7, 2024 · f7238fb · f7238fb
2 parents 3f0f075 + dd83520
commit f7238fb
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 797 deletions.
diff --git a/.github/workflows/main_pacmanaos.yml → .github/workflows/main_pacmanwebapp.yml b/.github/workflows/main_pacmanaos.yml → .github/workflows/main_pacmanwebapp.yml
@@ -1,7 +1,7 @@
 # Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
 # More GitHub Actions for Azure: https://github.com/Azure/actions
 
-name: Build and deploy JAR app to Azure Web App - pacmanAOS
+name: Build and deploy JAR app to Azure Web App - pacmanwebapp
 
 on:
   push:
@@ -47,7 +47,7 @@ jobs:
         id: deploy-to-webapp
         uses: azure/webapps-deploy@v2
         with:
-          app-name: 'pacmanAOS'
+          app-name: 'pacmanwebapp'
           slot-name: 'Production'
           package: '*.jar'
-          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_E345321F15DF4C098A631FB193F4C14F }}
+          publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_5A7719FB4BD34FEC986840EF0C861E96 }}
diff --git a/README.md b/README.md
diff --git a/src/main/java/Classes/Fruit.java b/src/main/java/Classes/Fruit.java
@@ -28,7 +28,7 @@ public void setPosition(Point position) {
     }
     // Méthode pour obtenir l'objet Fruit à une position spécifique dans la liste de fruits
 
-    public int getScore() {
+    public int getPointsFruit() {
 
         int points = 0;
         switch (type) {

diff --git a/src/main/java/Classes/Game.java b/src/main/java/Classes/Game.java
@@ -43,18 +43,7 @@ public char[][] updateGrid(int direction) {
             pacMan.deplacer(this.terrain.getGrille(), direction);
 //            this.lastDirections.add(direction);
         }
-//
-//        if (direction != null) {
-//            deplacerPacman(direction);
-//            checkCollisionPacmanFantome();
-//            checkCollisionPacmanBoule();
-//            checkGameOver();
-//        }
-//        if (!lastDirections.isEmpty()){
-//            if(direction == this.lastDirections.size() - 1){
-//                pacMan.deplacer(this.terrain.getGrille(), direction);
-//            }
-//        }
+
 
         // Mettre à jour la position des fantômes
         deplacerFantomes();
@@ -67,19 +56,11 @@ public void demarrerJeu(){
         afficherGrille(terrain.getGrille());
         this.started = true;
         initialiserJeu();
-//        updateGrid(1);
-//        updateGrid(1);
-//        updateGrid(1);
-//        updateGrid(1);
-//        updateGrid(2);
-//        for (int i = 0; i< x; i++){
-//            System.out.println("itération : "+i);
-//
-//        }
+
     }
 
-    public boolean finJeu(){
-        return false;
+    public void finJeu(){
+        this.started = false ;
     }
 
 
@@ -197,7 +178,9 @@ public PacMan getPacMan(){
     }
 
     public void setScore(int pointGagne){
-        this.score=+ pointGagne;
+        this.score+= pointGagne;
     }
 
+    public int getScore() {return score; }
+
 }