ajout class + personnages

julien
ZIRTR0X 4 years ago
parent 02c7b31cb0
commit fd243d4a2c

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
</set>
</option>
</component>
</project>

@ -2,13 +2,16 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="cdb932d9-7e58-4d94-93a9-e7b232ef17da" name="Default" comment="">
<change afterPath="$PROJECT_DIR$/src/model/Avatar.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/model/Case.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/model/CaseChance.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/model/CaseEvenement.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/model/CaseMalchance.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/model/Plateau.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../README.md" beforeDir="false" afterPath="$PROJECT_DIR$/../README.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/runConfigurations.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/code/launcher/Main.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/code/launcher/Main.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/code/model/Joueur.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/code/model/Joueur.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/launcher/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/launcher/Main.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/model/Avatar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/model/Avatar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/model/CaseChance.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/model/CaseChance.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/model/CaseEvenement.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/model/CaseEvenement.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/model/CaseMalchance.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/model/CaseMalchance.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/model/Joueur.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/model/Joueur.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -74,6 +77,14 @@
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
</component>
<component name="GitSEFilterConfiguration">
<file-type-list>
<filtered-out-file-type name="LOCAL_BRANCH" />
<filtered-out-file-type name="REMOTE_BRANCH" />
<filtered-out-file-type name="TAG" />
<filtered-out-file-type name="COMMIT_BY_MESSAGE" />
</file-type-list>
</component>
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
@ -144,15 +155,15 @@
<property name="MemberChooser.showClasses" value="true" />
<property name="MemberChooser.sorted" value="false" />
<property name="OverrideImplement.combined" value="false" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="dynamic.classpath" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="last_opened_file_path" value="$PATH_TO_JFX_11$" />
<property name="project.structure.last.edited" value="Libraries" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" />
<property name="recentsLimit" value="5" />
<property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
<property name="settings.editor.selected.configurable" value="preferences.pathVariables" />
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
@ -174,6 +185,17 @@
<option name="ALTERNATIVE_JRE_PATH" />
<method />
</configuration>
<configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
<option name="arquillianRunConfiguration">
<value>
<option name="containerStateName" value="" />
</value>
</option>
<option name="TEST_OBJECT" value="class" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="DartUnitRunConfigurationType" factoryName="DartUnit">
<option name="VMOptions" />
<option name="arguments" />
@ -208,17 +230,6 @@
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
<option name="arquillianRunConfiguration">
<value>
<option name="containerStateName" value="" />
</value>
</option>
<option name="TEST_OBJECT" value="class" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="JUnit" factoryName="JUnit">
<option name="TEST_OBJECT" value="class" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
@ -262,7 +273,11 @@
<workItem from="1359379250712" duration="1302000" />
<workItem from="1637998055094" duration="2133000" />
<workItem from="1638000460838" duration="1386000" />
<workItem from="1638002435143" duration="937000" />
<workItem from="1638002435143" duration="3215000" />
<workItem from="1638013999426" duration="57000" />
<workItem from="1638014080467" duration="1686000" />
<workItem from="1638366792686" duration="615000" />
<workItem from="1638377233852" duration="388000" />
</task>
<servers />
</component>

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

@ -1,4 +1,21 @@
package launcher;
import model.Avatar;
import model.Case;
public class Main {
public static void Main (String[] args) {
Case depart = new Case(1,10,10,true,false);
Avatar avatar1 = new Avatar(1,"Perso1.1.png",0,0);
int xdepart = depart.getCoordX();
avatar1.setCoordX(xdepart);
int ydepart = depart.getCoordY();
avatar1.setCoordY(ydepart);
int xavatar1 = avatar1.getCoordX();
int yavatar1 = avatar1.getCoordY();
System.out.println("xavatar1 = " + xavatar1);
System.out.println("yavatar1 = " + yavatar1);
System.out.println("xdepart = " + xdepart);
System.out.println("ydepart = " + ydepart);
}
}

@ -2,9 +2,18 @@ package model;
public class Avatar {
int idAvatar;
char image;
String image;
int coordX;
int coordY;
public Avatar(int idAvatar, char image) {
public Avatar(int idAvatar, String image, int coordX, int coordY) {
this.idAvatar = idAvatar;
this.image = image;
this.coordX = coordX;
this.coordY = coordY;
}
public Avatar(int idAvatar, String image) {
this.idAvatar = idAvatar;
this.image = image;
}
@ -13,15 +22,31 @@ public class Avatar {
return idAvatar;
}
public char getImage() {
public String getImage() {
return image;
}
public int getCoordX() {
return coordX;
}
public int getCoordY() {
return coordY;
}
public void setIdAvatar(int idAvatar) {
this.idAvatar = idAvatar;
}
public void setImage(char image) {
public void setImage(String image) {
this.image = image;
}
public void setCoordX(int coordX) {
this.coordX = coordX;
}
public void setCoordY(int coordY) {
this.coordY = coordY;
}
}

@ -1,18 +1,18 @@
package model;
public class CaseChance extends Case{
char bonus;
String bonus;
public CaseChance(int idCase, int coordX, int coordY, boolean isStart, boolean isEnd, char bonus) {
public CaseChance(int idCase, int coordX, int coordY, boolean isStart, boolean isEnd, String bonus) {
super(idCase, coordX, coordY, isStart, isEnd);
this.bonus = bonus;
}
public char getBonus() {
public String getBonus() {
return bonus;
}
public void setBonus(char bonus) {
public void setBonus(String bonus) {
this.bonus = bonus;
}
}

@ -1,18 +1,18 @@
package model;
public class CaseEvenement extends Case{
char evenement;
String evenement;
public CaseEvenement(int idCase, int coordX, int coordY, boolean isStart, boolean isEnd, char evenement) {
public CaseEvenement(int idCase, int coordX, int coordY, boolean isStart, boolean isEnd, String evenement) {
super(idCase, coordX, coordY, isStart, isEnd);
this.evenement = evenement;
}
public char getEvenement() {
public String getEvenement() {
return evenement;
}
public void setEvenement(char evenement) {
public void setEvenement(String evenement) {
this.evenement = evenement;
}
}

@ -1,18 +1,18 @@
package model;
public class CaseMalchance extends Case{
char malus;
public class CaseMalchance extends Case {
String malus;
public CaseMalchance(int idCase, int coordX, int coordY, boolean isStart, boolean isEnd, char malus) {
public CaseMalchance(int idCase, int coordX, int coordY, boolean isStart, boolean isEnd, String malus) {
super(idCase, coordX, coordY, isStart, isEnd);
this.malus = malus;
}
public char getMalus() {
public String getMalus() {
return malus;
}
public void setMalus(char malus) {
public void setMalus(String malus) {
this.malus = malus;
}
}

@ -2,10 +2,10 @@ package model;
public class Joueur {
int idJoueur;
char pseudonyme;
String pseudonyme;
int scoreMax;
public Joueur(int idJoueur, char pseudonyme, int scoreMax) {
public Joueur(int idJoueur, String pseudonyme, int scoreMax) {
this.idJoueur = idJoueur;
this.pseudonyme = pseudonyme;
this.scoreMax = scoreMax;
@ -15,7 +15,7 @@ public class Joueur {
return idJoueur;
}
public char getPseudonyme() {
public String getPseudonyme() {
return pseudonyme;
}
@ -27,7 +27,7 @@ public class Joueur {
this.idJoueur = idJoueur;
}
public void setPseudonyme(char pseudonyme) {
public void setPseudonyme(String pseudonyme) {
this.pseudonyme = pseudonyme;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 111 KiB

@ -0,0 +1,6 @@
for x in {1..12} do
for y in {1..8} do
xd=x*48;
yd=y*48;
convert -extract 48x48+xd+yd D:\Documents\GitHub\projetJavaFX_Gitlab\documentation\people12.png D:\Documents\GitHub\projetJavaFX_Gitlab\documentation\perso.png

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.5" tiledversion="1.7.2" name="personnage" tilewidth="48" tileheight="48" tilecount="96" columns="12">
<image source="../../../../Téléchargements/people12.png" width="576" height="384"/>
</tileset>
Loading…
Cancel
Save