correction de conflit

not-alone-doc/src/doc/asciidoc/_sections/analyse.adoc

@@ -267,13 +267,13 @@ class CarteLieu4 {
 }
 
 Traque -> "main     " CarteLieu1 : \t\t
-Traque --> "deffausse   " CarteLieu2 : \t\t
-Traque --> "deffausse   " CarteLieu3 : \t\t
-Traque --> "deffausse   " CarteLieu4 : \t\t
+Traque --> "defausse   " CarteLieu2 : \t\t
+Traque --> "defausse   " CarteLieu3 : \t\t
+Traque --> "defausse   " CarteLieu4 : \t\t
 
 ....
 
-après éxécution
+après exécution
 
 [plantuml, exemple-apres-resister, png]
 ....

not-alone-player/pom.xml

@@ -20,8 +20,8 @@
         <version>1.10.0</version>
         <configuration>
           <workingDirectory>./</workingDirectory>
-          <nodeVersion>v14.11.0</nodeVersion>
-          <yarnVersion>v1.22.10</yarnVersion>
+          <nodeVersion>v12.18.4cdc</nodeVersion>
+          <yarnVersion>v1.22.5</yarnVersion>
         </configuration>
         <executions>
 

not-alone-player/pom.xml~

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="http://maven.apache.org/POM/4.0.0"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <artifactId>not-alone</artifactId>
+    <groupId>fr.univnantes.alma</groupId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>not-alone-player</artifactId>
+  <name>Not Alone Player Services</name>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.github.eirslett</groupId>
+        <artifactId>frontend-maven-plugin</artifactId>
+        <version>1.10.0</version>
+        <configuration>
+          <workingDirectory>./</workingDirectory>
+          <nodeVersion>v12.18.4</nodeVersion>
+          <yarnVersion>v1.22.5</yarnVersion>
+        </configuration>
+        <executions>
+
+          <execution>
+            <id>install-node-and-yarn</id>
+            <goals>
+              <goal>install-node-and-yarn</goal>
+            </goals>
+            <phase>generate-resources</phase>
+          </execution>
+
+          <execution>
+            <id>yarn-install</id>
+            <goals>
+              <goal>yarn</goal>
+            </goals>
+            <configuration>
+              <arguments>install</arguments>
+            </configuration>
+            <phase>generate-resources</phase>
+          </execution>
+
+          <execution>
+            <id>yarn run build</id>
+            <goals>
+              <goal>yarn</goal>
+            </goals>
+            <configuration>
+              <arguments>run build</arguments>
+            </configuration>
+            <phase>compile</phase>
+          </execution>
+
+          <execution>
+            <id>code-generation</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>yarn</goal>
+            </goals>
+            <configuration>
+              <arguments>run codegen</arguments>
+            </configuration>
+          </execution>
+
+          <execution>
+            <id>yarn-clean</id>
+            <phase>clean</phase>
+            <goals>
+              <goal>yarn</goal>
+            </goals>
+            <configuration>
+              <arguments>run clean</arguments>
+            </configuration>
+          </execution>
+
+        </executions>
+      </plugin>
+    </plugins>
+    <resources>
+      <resource>
+        <directory>./dist/not-alone-web</directory>
+        <targetPath>static</targetPath>
+      </resource>
+    </resources>
+  </build>
+
+</project>

not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Carte/Carte.java

+package fr.univnantes.alma.game.composant.Carte;
+
+public class Carte {
+}

not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Carte/CarteLieu.java

+package fr.univnantes.alma.game.composant.Carte;
+
+public class CarteLieu {
+}

not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Carte/CarteSurvie.java

+package fr.univnantes.alma.game.composant.Carte;
+
+public class CarteSurvie {
+}

not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Carte/CarteTraque.java

+package fr.univnantes.alma.game.composant.Carte;
+
+public class CarteTraque {
+}

not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Jeton/Jeton.java

+package fr.univnantes.alma.game.composant.Jeton;
+
+import fr.univnantes.alma.game.composant.Carte.CarteLieu;
+
+import java.util.ArrayList;
+
+public abstract class Jeton {
+    ArrayList<CarteLieu> position;
+
+    public Jeton() {
+        this.position = new ArrayList<>();
+    }
+    public void poserJeton(CarteLieu clieu)
+    {
+        position.add(clieu);
+    }
+
+    public void retirerJeton()
+    {
+        position.clear();
+    }
+
+    public abstract void pouvoir();
+
+    public ArrayList<CarteLieu> getPosition() {
+        return position;
+    }
+
+    public boolean equals(Object obj) {
+        if(obj == this){
+            return true;
+        }
+        if(!(obj instanceof Jeton)){
+            return false;
+        }
+        Jeton jeton = (Jeton) obj;
+        return position.equals(jeton.getPosition());
+    }
+
+
+
+
+
+}

not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Jeton/JetonArtemia.java

+package fr.univnantes.alma.game.composant.Jeton;
+
+import fr.univnantes.alma.game.composant.Carte.CarteLieu;
+
+import java.util.ArrayList;
+
+public class JetonArtemia extends Jeton {
+
+    public JetonArtemia() {
+        this.position = new ArrayList<>();
+    }
+
+    @Override
+    public void pouvoir() {
+        //
+    }
+}

not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Jeton/JetonCible.java

+package fr.univnantes.alma.game.composant.Jeton;
+
+import fr.univnantes.alma.game.composant.Carte.CarteLieu;
+
+import java.util.ArrayList;
+
+public class JetonCible extends Jeton {
+
+    public JetonCible() {
+        this.position = new ArrayList<>();
+    }
+
+    @Override
+    public void pouvoir() {
+        //
+    }
+}

not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Jeton/JetonCreature.java

+package fr.univnantes.alma.game.composant.Jeton;
+
+import java.util.ArrayList;
+
+public class JetonCreature extends Jeton{
+    public JetonCreature() {
+        this.position = new ArrayList<>();
+    }
+
+    @Override
+    public void pouvoir() {
+        //
+    }
+}

not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Joueur/Creature.java

+package fr.univnantes.alma.game.composant.Joueur;
+
+public class Creature {
+}

not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Joueur/Joueur.java

+package fr.univnantes.alma.game.composant.Joueur;
+
+public class Joueur {
+}

not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Joueur/Traque.java

+package fr.univnantes.alma.game.composant.Joueur;
+
+public class Traque {
+}

not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Pion/Pion.java

+package fr.univnantes.alma.game.composant.Pion;
+
+public class Pion {
+}

not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Pion/PionAssimilation.java

+package fr.univnantes.alma.game.composant.Pion;
+
+public class PionAssimilation {
+}

not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Pion/PionSecours.java

+package fr.univnantes.alma.game.composant.Pion;
+
+public class PionSecours {
+}

not-alone-server/src/main/java/fr/univnantes/alma/game/composant/Plateau.java

+package fr.univnantes.alma.game.composant;
+
+public class Plateau {
+}