Commit 1e97cdc7 authored by Antoine Guérin's avatar Antoine Guérin

correction de conflit

parents 1d29b2e7 2fec3482
......@@ -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]
....
......
This diff is collapsed.
......@@ -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>
......
<?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>
package fr.univnantes.alma.game.composant.Carte;
public class Carte {
}
package fr.univnantes.alma.game.composant.Carte;
public class CarteLieu {
}
package fr.univnantes.alma.game.composant.Carte;
public class CarteSurvie {
}
package fr.univnantes.alma.game.composant.Carte;
public class CarteTraque {
}
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());
}
}
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() {
//
}
}
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() {
//
}
}
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() {
//
}
}
package fr.univnantes.alma.game.composant.Joueur;
public class Creature {
}
package fr.univnantes.alma.game.composant.Joueur;
public class Joueur {
}
package fr.univnantes.alma.game.composant.Joueur;
public class Traque {
}
package fr.univnantes.alma.game.composant.Pion;
public class Pion {
}
package fr.univnantes.alma.game.composant.Pion;
public class PionAssimilation {
}
package fr.univnantes.alma.game.composant.Pion;
public class PionSecours {
}
package fr.univnantes.alma.game.composant;
public class Plateau {
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment