Marc/PTS3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ajout exception + avancement serveur client + refactor des cartes + nouvelles commandes

Browse Source
This commit is contained in:
marc barbier
2020-12-12 13:14:52 +01:00
parent 41d0061b79
commit e1c8e312b2
101 changed files with 483 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/iutlaval/myapplication/Game/Cards/CardRegistery.java
+94
View File
@@ -1,5 +1,96 @@
package com.iutlaval.myapplication.Game.Cards;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_Charlemagne;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_CharlesV;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_CharlesVII;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_Chretien_De_Troyes;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_Christine;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_Clovis;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_Croisade;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_Etienne;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_Ferré;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_Guerre_100;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_Guillaume;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_Heresie_Cathares;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_Hugue;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_Isabelle;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_Jean;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_Jean_Vienne;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_Jeanne;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_Louis;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_Malediction_Templier;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_Peste;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_Philippe;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_PhilippeIV;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_Philippe_Cacqueray;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_Pierre;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_Pierre_Ermite;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_Pouvoir_Du_Franc;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_Prise_Sainte_Terre;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_Roland;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_Sire_Jean;
import com.iutlaval.myapplication.Game.Cards.MoyenAge.Moyen_Age_Traite_Verdun;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_12_Travaux;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Achille;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Amazones;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Castor_Pollux;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Chant_Sirene;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Chaos;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Cheval_Troie;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Chiron;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Dédale;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Enigme_Sphinx;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Eole;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Erinyes;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Guerre_Sept_Chefs;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Hades;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Heracles;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Hermione;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Icar;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Kunée;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Minos;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Oedipie;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Perséphone;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Poseidon;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Psyché;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Rapt;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Sémélé;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Thanatos;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Titanomachie;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Toison;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Zeus;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Zeus_VS_Typhon;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Copernic;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Mehmet;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Soliman;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Rennaissance_Casimir;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Rennaissance_Charles;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Rennaissance_Chatherine;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Rennaissance_Chute_Constantinople;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Rennaissance_Concile_Trente;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Rennaissance_Constantin;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Rennaissance_Decouverte_Amerique;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Rennaissance_Elisabeth;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Rennaissance_Ferdinand;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Rennaissance_Fin_Guerre_Cent_Ans;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Rennaissance_Francois;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Rennaissance_Guerres_Italie;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Rennaissance_Henri;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Rennaissance_Henri_8;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Rennaissance_Isabelle;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Rennaissance_Ivan;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Rennaissance_Leonard;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Rennaissance_Machiavel;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Rennaissance_Michel_Ange;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Rennaissance_Nobunaga;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Rennaissance_Presse_Imprimer;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Rennaissance_Rabelais;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Rennaissance_Reforme;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Rennaissance_Shakespeare;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Rennaissance_Skanderberg;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Rennaissance_Succession_Bourgogne;
import com.iutlaval.myapplication.Game.Cards.Renaissance.Rennaissance_Vlad;
import java.util.ArrayList;
import java.util.List;
@@ -123,4 +214,7 @@ public class CardRegistery {
}
public static int get(Card card) {
return get(card.getClass());
}
}
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Charlemagne.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Charlemagne.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_Charlemagne extends Card{
public class Moyen_Age_Charlemagne extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_CharlesV.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_CharlesV.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_CharlesV extends Card{
public class Moyen_Age_CharlesV extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_CharlesVII.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_CharlesVII.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_CharlesVII extends Card{
public class Moyen_Age_CharlesVII extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Chretien_De_Troyes.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Chretien_De_Troyes.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_Chretien_De_Troyes extends Card{
public class Moyen_Age_Chretien_De_Troyes extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Christine.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Christine.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_Christine extends Card{
public class Moyen_Age_Christine extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Clovis.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Clovis.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_Clovis extends Card{
public class Moyen_Age_Clovis extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Croisade.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Croisade.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_Croisade extends Card{
public class Moyen_Age_Croisade extends Card {
/**
* cree une carte est lui definit un drawable
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Etienne.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Etienne.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_Etienne extends Card{
public class Moyen_Age_Etienne extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Ferré.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Ferré.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_Ferré extends Card{
public class Moyen_Age_Ferré extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Guerre_100.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Guerre_100.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_Guerre_100 extends Card{
public class Moyen_Age_Guerre_100 extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Guillaume.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Guillaume.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_Guillaume extends Card{
public class Moyen_Age_Guillaume extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Heresie_Cathares.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Heresie_Cathares.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_Heresie_Cathares extends Card{
public class Moyen_Age_Heresie_Cathares extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Hugue.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Hugue.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_Hugue extends Card{
public class Moyen_Age_Hugue extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Isabelle.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Isabelle.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_Isabelle extends Card{
public class Moyen_Age_Isabelle extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Jean.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Jean.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_Jean extends Card{
public class Moyen_Age_Jean extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Jean_Vienne.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Jean_Vienne.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_Jean_Vienne extends Card{
public class Moyen_Age_Jean_Vienne extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Jeanne.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Jeanne.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_Jeanne extends Card{
public class Moyen_Age_Jeanne extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Louis.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Louis.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_Louis extends Card{
public class Moyen_Age_Louis extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Malediction_Templier.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Malediction_Templier.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_Malediction_Templier extends Card{
public class Moyen_Age_Malediction_Templier extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Peste.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Peste.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_Peste extends Card{
public class Moyen_Age_Peste extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Philippe.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Philippe.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_Philippe extends Card{
public class Moyen_Age_Philippe extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_PhilippeIV.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_PhilippeIV.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_PhilippeIV extends Card{
public class Moyen_Age_PhilippeIV extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Philippe_Cacqueray.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Philippe_Cacqueray.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_Philippe_Cacqueray extends Card{
public class Moyen_Age_Philippe_Cacqueray extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Pierre.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pierre.java
+4 -3
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_Pierre extends Card{
public class Moyen_Age_Pierre extends Card {
/**
* cree une carte est lui definit un drawable
*
@@ -22,7 +23,7 @@ public class Moyen_Age_Pierre extends Card{
*/
@Override
public int getCardPicture() {
return R.drawable.t_c_pierre;
return R.drawable.t_c_pierre_ermite;
}
/**
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Pierre_Ermite.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pierre_Ermite.java
+4 -3
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_Pierre_Ermite extends Card{
public class Moyen_Age_Pierre_Ermite extends Card {
/**
* cree une carte est lui definit un drawable
*
@@ -22,7 +23,7 @@ public class Moyen_Age_Pierre_Ermite extends Card{
*/
@Override
public int getCardPicture() {
return R.drawable.t_c_pierre;
return R.drawable.t_c_pierre_ermite;
}
/**
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Pouvoir_Du_Franc.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pouvoir_Du_Franc.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_Pouvoir_Du_Franc extends Card{
public class Moyen_Age_Pouvoir_Du_Franc extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Prise_Sainte_Terre.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Prise_Sainte_Terre.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_Prise_Sainte_Terre extends Card{
public class Moyen_Age_Prise_Sainte_Terre extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Roland.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Roland.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_Roland extends Card{
public class Moyen_Age_Roland extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Sire_Jean.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Sire_Jean.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_Sire_Jean extends Card{
public class Moyen_Age_Sire_Jean extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Traite_Verdun.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Traite_Verdun.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.MoyenAge;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Moyen_Age_Traite_Verdun extends Card{
public class Moyen_Age_Traite_Verdun extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_12_Travaux.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_12_Travaux.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_12_Travaux extends Card{
public class Mythes_12_Travaux extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Achille.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Achille.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_Achille extends Card{
public class Mythes_Achille extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Amazones.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Amazones.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_Amazones extends Card{
public class Mythes_Amazones extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Castor_Pollux.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Castor_Pollux.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_Castor_Pollux extends Card{
public class Mythes_Castor_Pollux extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Chant_Sirene.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Chant_Sirene.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_Chant_Sirene extends Card{
public class Mythes_Chant_Sirene extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Chaos.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Chaos.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_Chaos extends Card{
public class Mythes_Chaos extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Cheval_Troie.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Cheval_Troie.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_Cheval_Troie extends Card{
public class Mythes_Cheval_Troie extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Chiron.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Chiron.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_Chiron extends Card{
public class Mythes_Chiron extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Dédale.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Dédale.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_Dédale extends Card{
public class Mythes_Dédale extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Enigme_Sphinx.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Enigme_Sphinx.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_Enigme_Sphinx extends Card{
public class Mythes_Enigme_Sphinx extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Eole.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Eole.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_Eole extends Card{
public class Mythes_Eole extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Erinyes.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Erinyes.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_Erinyes extends Card{
public class Mythes_Erinyes extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Guerre_Sept_Chefs.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Guerre_Sept_Chefs.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_Guerre_Sept_Chefs extends Card{
public class Mythes_Guerre_Sept_Chefs extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Hades.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Hades.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_Hades extends Card{
public class Mythes_Hades extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Heracles.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Heracles.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_Heracles extends Card{
public class Mythes_Heracles extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Hermione.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Hermione.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_Hermione extends Card{
public class Mythes_Hermione extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Icar.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Icar.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_Icar extends Card{
public class Mythes_Icar extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Kunée.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Kunée.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_Kunée extends Card{
public class Mythes_Kunée extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Minos.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Minos.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_Minos extends Card{
public class Mythes_Minos extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Oedipie.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Oedipie.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_Oedipie extends Card{
public class Mythes_Oedipie extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Perséphone.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Perséphone.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_Perséphone extends Card{
public class Mythes_Perséphone extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Poseidon.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Poseidon.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_Poseidon extends Card{
public class Mythes_Poseidon extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Psyché.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Psyché.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_Psyché extends Card{
public class Mythes_Psyché extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Rapt.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Rapt.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_Rapt extends Card{
public class Mythes_Rapt extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Sémélé.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Sémélé.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_Sémélé extends Card{
public class Mythes_Sémélé extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Thanatos.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Thanatos.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_Thanatos extends Card{
public class Mythes_Thanatos extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Titanomachie.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Titanomachie.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_Titanomachie extends Card{
public class Mythes_Titanomachie extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Toison.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Toison.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_Toison extends Card{
public class Mythes_Toison extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Zeus.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Zeus.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_Zeus extends Card{
public class Mythes_Zeus extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Zeus_VS_Typhon.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Zeus_VS_Typhon.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Mythes;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Mythes_Zeus_VS_Typhon extends Card{
public class Mythes_Zeus_VS_Typhon extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance_Copernic.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Copernic.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Renaissance_Copernic extends Card{
public class Renaissance_Copernic extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance_Mehmet.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Mehmet.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Renaissance_Mehmet extends Card{
public class Renaissance_Mehmet extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance_Soliman.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Soliman.java
+2 -1
View File
@@ -1,7 +1,8 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Renaissance_Soliman extends Card {
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Casimir.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Casimir.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Rennaissance_Casimir extends Card{
public class Rennaissance_Casimir extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Charles.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Charles.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Rennaissance_Charles extends Card{
public class Rennaissance_Charles extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Chatherine.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Chatherine.java
+2 -1
View File
@@ -1,7 +1,8 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Rennaissance_Chatherine extends Card {
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Chute_Constantinople.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Chute_Constantinople.java
+2 -1
View File
@@ -1,7 +1,8 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Rennaissance_Chute_Constantinople extends Card {
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Concile_Trente.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Concile_Trente.java
+2 -1
View File
@@ -1,7 +1,8 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Rennaissance_Concile_Trente extends Card {
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Constantin.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Constantin.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Rennaissance_Constantin extends Card{
public class Rennaissance_Constantin extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Decouverte_Amerique.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Decouverte_Amerique.java
+2 -1
View File
@@ -1,7 +1,8 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Rennaissance_Decouverte_Amerique extends Card {
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Elisabeth.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Elisabeth.java
+2 -1
View File
@@ -1,7 +1,8 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Rennaissance_Elisabeth extends Card {
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Ferdinand.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Ferdinand.java
+2 -1
View File
@@ -1,7 +1,8 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Rennaissance_Ferdinand extends Card {
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Fin_Guerre_Cent_Ans.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Fin_Guerre_Cent_Ans.java
+2 -1
View File
@@ -1,7 +1,8 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Rennaissance_Fin_Guerre_Cent_Ans extends Card {
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Francois.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Francois.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Rennaissance_Francois extends Card{
public class Rennaissance_Francois extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Guerres_Italie.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Guerres_Italie.java
+2 -1
View File
@@ -1,7 +1,8 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Rennaissance_Guerres_Italie extends Card {
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Henri.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Henri.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Rennaissance_Henri extends Card{
public class Rennaissance_Henri extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Henri_8.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Henri_8.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Rennaissance_Henri_8 extends Card{
public class Rennaissance_Henri_8 extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Isabelle.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Isabelle.java
+2 -1
View File
@@ -1,7 +1,8 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Rennaissance_Isabelle extends Card {
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Ivan.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Ivan.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Rennaissance_Ivan extends Card{
public class Rennaissance_Ivan extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Leonard.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Leonard.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Rennaissance_Leonard extends Card{
public class Rennaissance_Leonard extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Machiavel.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Machiavel.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Rennaissance_Machiavel extends Card{
public class Rennaissance_Machiavel extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Michel_Ange.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Michel_Ange.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Rennaissance_Michel_Ange extends Card{
public class Rennaissance_Michel_Ange extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Nobunaga.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Nobunaga.java
+2 -1
View File
@@ -1,7 +1,8 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Rennaissance_Nobunaga extends Card {
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Presse_Imprimer.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Presse_Imprimer.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Rennaissance_Presse_Imprimer extends Card{
public class Rennaissance_Presse_Imprimer extends Card {
/**
* cree une carte est lui definit un drawable
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Rabelais.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Rabelais.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Rennaissance_Rabelais extends Card{
public class Rennaissance_Rabelais extends Card {
/**
* cree une carte est lui definit un drawable
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Reforme.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Reforme.java
+2 -1
View File
@@ -1,7 +1,8 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Rennaissance_Reforme extends Card {
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Shakespeare.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Shakespeare.java
+2 -1
View File
@@ -1,7 +1,8 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Rennaissance_Shakespeare extends Card {
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Skanderberg.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Skanderberg.java
+2 -1
View File
@@ -1,7 +1,8 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Rennaissance_Skanderberg extends Card {
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Succession_Bourgogne.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Succession_Bourgogne.java
+3 -2
View File
@@ -1,10 +1,11 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Rennaissance_Succession_Bourgogne extends Card{
public class Rennaissance_Succession_Bourgogne extends Card {
/**
* cree une carte est lui definit un drawable
*
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Vlad.java → app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Vlad.java
+2 -1
View File
@@ -1,7 +1,8 @@
package com.iutlaval.myapplication.Game.Cards;
package com.iutlaval.myapplication.Game.Cards.Renaissance;
import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.R;
public class Rennaissance_Vlad extends Card {
app/src/main/java/com/iutlaval/myapplication/Game/COMMAND.java → app/src/main/java/com/iutlaval/myapplication/Game/Command.java
+9 -3
View File
@@ -1,6 +1,8 @@
package com.iutlaval.myapplication.Game;
public final class COMMAND {
public final class Command {
private Command(){} // pas de contructor public on ne veut pas instancier cette classe
public static final String YOURTURN="yourturn";
public static final String DRAW = "draw";
public static final String GET_DECK = "getDeck";
@@ -9,8 +11,12 @@ public final class COMMAND {
public static final String SELECT_CARD = "selectCard";
public static final String ATTACK = "attack";
public static final String DEFEND = "defend";
public static final String CAST_SPELL = "castSpell";
public static final String PASS_TURN = "passTurn";
public static final String POPUP = "pupup";
public static final String ENEMYTURN = "enemyTurn";
public static final String SETMANA = "setmana";
public static final String WIN = "win";
public static final String LOSE = "lose";
public static final String PING = "ping";
public static final Object OK = "ok";
}
app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java
+80 -50
View File
@@ -1,21 +1,15 @@
package com.iutlaval.myapplication.Game;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.util.Log;
import android.view.MotionEvent;
import android.widget.Toast;
import androidx.fragment.app.DialogFragment;
import com.iutlaval.myapplication.DeckPickDialogue;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.Game.Cards.CardRegistery;
import com.iutlaval.myapplication.GameActivity;
import com.iutlaval.myapplication.MainActivity;
import com.iutlaval.myapplication.R;
import com.iutlaval.myapplication.Video.Drawables.Drawable;
import com.iutlaval.myapplication.Video.Drawables.DrawableBitmap;
@@ -23,6 +17,7 @@ import com.iutlaval.myapplication.Video.Drawables.DrawableCard;
import com.iutlaval.myapplication.Video.Drawables.DrawableSelfRemoving;
import com.iutlaval.myapplication.Video.Drawables.DrawableText;
import com.iutlaval.myapplication.Video.Renderer;
import com.iutlaval.myapplication.exception.UnrecognizedCard;
import java.io.IOException;
import java.io.InterruptedIOException;
@@ -32,6 +27,10 @@ import java.net.Socket;
public class GameLogicThread extends Thread{
public static final float BUTTON_Y_POS = 50F;
public static final int BUTTON_X_POS = 0;
public static final float BUTTON_X_SIZE = 5F;
public static final float BUTTON_Y_SIZE = 2.5F;
private Context cont;
private Renderer renderer;
private boolean ready;
@@ -47,6 +46,7 @@ public class GameLogicThread extends Thread{
private boolean cancelled;
private Socket client;
private String deckName;
private int mana=0;
public GameLogicThread(GameActivity gameActivity, String deckName, Renderer renderer)
{
@@ -71,6 +71,8 @@ public class GameLogicThread extends Thread{
//loading textures
Bitmap bitmapYourTurn = BitmapFactory.decodeResource(renderer.getResources(),R.drawable.t_pb_your_turn);
Bitmap bitmapEnemyTurn = BitmapFactory.decodeResource(renderer.getResources(),R.drawable.t_pb_enemy_turn);
Bitmap bitmapButtonEnd = BitmapFactory.decodeResource(renderer.getResources(),R.drawable.t_pb_enemy_turn);
Bitmap bitmap= BitmapFactory.decodeResource(cont.getResources(), R.drawable.t_b_board_background);
//adding the background
@@ -105,7 +107,7 @@ public class GameLogicThread extends Thread{
String serveurCmd = (String)clientIn.readObject();
switch (serveurCmd)
{
case COMMAND.GET_DECK:
case Command.GET_DECK:
clientOut.writeObject(deckName);
String deckstr = (String)clientIn.readObject();
deck = new NetworkDeck(deckstr,gameActivity.getBaseContext());
@@ -113,48 +115,58 @@ public class GameLogicThread extends Thread{
Log.e("recived","getdeck");
break;
case COMMAND.DRAW:
case Command.DRAW:
int nbcard = (Integer)clientIn.readObject();
hand.pickCardFromDeck(deck,nbcard);
Log.e("picked",nbcard+"card");
drawHandPreview();
break;
case COMMAND.YOURTURN:
case Command.YOURTURN:
isYourTurn=true;
renderer.addToDraw(new DrawableSelfRemoving(new DrawableBitmap(bitmapYourTurn,0,0,"yourTurn",100F,50F),1));
renderer.addToDraw(new DrawableBitmap(bitmapButtonEnd, BUTTON_X_POS, BUTTON_Y_POS,"buttonturn", BUTTON_X_SIZE, BUTTON_Y_SIZE));
break;
case COMMAND.PUT_CARD:
//TODO put card on the battlefield
case Command.SETMANA:
renderer.removeToDraw("mana");
mana = (int)clientIn.readObject();
renderer.addToDraw(new DrawableText("Mana : "+mana,90F,90F,"mana",10F,10F,100,800,200));
break;
case COMMAND.SHUFFLE_DECK:
//TODO shuffle deck
case Command.ENEMYTURN:
isYourTurn=false;
renderer.addToDraw(new DrawableSelfRemoving(new DrawableBitmap(bitmapEnemyTurn,0,0,"enemyTurn",100F,50F),1));
break;
case COMMAND.SELECT_CARD:
//TODO select a card
break;
case COMMAND.ATTACK:
//TODO attack
break;
case COMMAND.DEFEND:
//TODO defend
break;
case COMMAND.CAST_SPELL:
//TODO cast spell
break;
case COMMAND.PASS_TURN:
//TODO pass turn
break;
case COMMAND.POPUP:
case Command.POPUP:
String recivedMessage = (String)clientIn.readObject();
Toast t = new Toast(gameActivity);
t.setText(recivedMessage);
t.setDuration(Toast.LENGTH_LONG);
t.show();
Toast popupToast = new Toast(gameActivity);
popupToast.setText(recivedMessage);
popupToast.setDuration(Toast.LENGTH_LONG);
popupToast.show();
break;
case Command.WIN:
//on termine la parite
cancelled = true;
Toast winToast = new Toast(gameActivity);
winToast.setText("bravo ! vous avez gagné");
winToast.setDuration(Toast.LENGTH_LONG);
winToast.show();
break;
case Command.LOSE:
//on termine la partie
cancelled=true;
Toast loseToast = new Toast(gameActivity);
loseToast.setText("vous avez perdu!");
loseToast.setDuration(Toast.LENGTH_LONG);
loseToast.show();
break;
case Command.PING:
clientOut.writeObject("pong");
break;
default:
Log.e("UNKOWN COMMAND",serveurCmd);
}
@@ -188,10 +200,30 @@ public class GameLogicThread extends Thread{
* cette evenement est appelé par le touchHandler et permet d'envoyer au serveur le fait qu'un carte a été jouer
* @param card la carte jouer
* @param zone ou elle a été joué sur le terrain
* @return retourne si la carte a put être jouer
*/
protected void onCardPlayed(Drawable card,int zone)
protected boolean onCardPlayed(DrawableCard card,int zone)
{
try {
//on veut jouer une carte
clientOut.writeObject(Command.PUT_CARD);
//on lui dit quelle caret on veut
int cardId = CardRegistery.get(card.getCard());
if(cardId == -1){
clientOut.writeObject("CLIENT REGISTRY ERROR");
throw new UnrecognizedCard();
}
clientOut.writeObject(cardId);
if(clientIn.readObject().equals(Command.OK))
{
return true;
}else{
return false;
}
} catch (IOException | ClassNotFoundException e) {
return false;
}
}
/**
@@ -250,22 +282,20 @@ public class GameLogicThread extends Thread{
interrupt();
}
}
/**
* ce thread a pour role de repondre pong au requette udp contenant ping
*
* cela sert a verifier sur le clien et présent sans blockage
*/
class UDPPingThread extends Thread
{
public UDPPingThread()
{
}
@Override
public void run() {
super.run();
public void onEndTurnButtonPushed() {
if(isYourTurn)
{
try {
clientOut.writeObject(Command.PASS_TURN);
} catch (IOException e) {
e.printStackTrace();
}
}else{
Toast t = new Toast(gameActivity);
t.setText("IT'S NOT YOUR TURN BE PATIENT");
t.setDuration(Toast.LENGTH_SHORT);
t.show();
}
}
}
app/src/main/java/com/iutlaval/myapplication/Game/NetworkDeck.java
+1 -1
View File
@@ -4,7 +4,7 @@ import android.content.Context;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.Game.Cards.CardRegistery;
import com.iutlaval.myapplication.Game.Cards.Mythes_Perséphone;
import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Perséphone;
import java.lang.reflect.Constructor;
import java.util.Stack;
app/src/main/java/com/iutlaval/myapplication/Game/TouchHandler.java
+26 -14
View File
@@ -7,6 +7,10 @@ import com.iutlaval.myapplication.GameActivity;
import com.iutlaval.myapplication.Video.Drawables.DrawableCard;
import com.iutlaval.myapplication.Video.Renderer;
/**
* NOT A MES COLEGUES : n'optimiser pas cette classe elle est sub optimal c'est évident je le sais MAIS
* la compréhention du code deviendera trés difficile si on optimise
*/
public class TouchHandler {
private float TouchDeltaX = 0;
@@ -22,6 +26,8 @@ public class TouchHandler {
private Renderer renderer;
private GameLogicThread gameLogic;
private Context context;
private float unScalled_X;
private float unScalled_Y;
public TouchHandler(Renderer renderer, GameLogicThread gameLogic, Context context)
{
@@ -37,6 +43,8 @@ public class TouchHandler {
*/
public void onTouchEvent(MotionEvent event)
{
unScalled_X = event.getX() / GameActivity.screenWidth * 100;
unScalled_Y = event.getY() / GameActivity.screenHeight * 100;
//on ignore le multi touch
if(event.getPointerCount() <= 1)
{
@@ -61,19 +69,18 @@ public class TouchHandler {
private void dragAndDropHandler(MotionEvent event)
{
//on calcul les coordonées en % de l'écran
float unscaled_X = event.getX() / GameActivity.screenWidth * 100;
float unscaled_Y = event.getY() / GameActivity.screenHeight * 100;
//quand on appui on capture une carte et on note sa positon initial
if (event.getAction() == MotionEvent.ACTION_DOWN) {
dragAndDropCard = renderer.getCardOn(unscaled_X, unscaled_Y);
dragAndDropCard = renderer.getCardOn(unScalled_X, unScalled_Y);
if(dragAndDropCard != null && !dragAndDropCard.isDraggable()) dragAndDropCard = null;
if (dragAndDropCard != null) {
//on calcul la position par raport au doigt de l'utilisateur
TouchDeltaY = unscaled_Y - dragAndDropCard.getY();
TouchDeltaX = unscaled_X - dragAndDropCard.getX();
TouchDeltaY = unScalled_Y - dragAndDropCard.getY();
TouchDeltaX = unScalled_X - dragAndDropCard.getX();
originalPositionX = dragAndDropCard.getX();
originalPositionY = dragAndDropCard.getY();
}
@@ -84,7 +91,7 @@ public class TouchHandler {
//dragAndDropCard = null;
} else if (dragAndDropCard != null) {
dragAndDropCard.setCoordinates(unscaled_X - TouchDeltaX, unscaled_Y - TouchDeltaY);
dragAndDropCard.setCoordinates(unScalled_X - TouchDeltaX, unScalled_Y - TouchDeltaY);
renderer.updateFrame();
}
}
@@ -95,10 +102,6 @@ public class TouchHandler {
*/
private void bigCardHandler(MotionEvent event)
{
//calcul y,x sur une echelle de 0 a 100
float unScalled_Y = event.getY() / GameActivity.screenHeight * 100;
float unScalled_X = event.getX() / GameActivity.screenWidth * 100;
if(event.getAction() == MotionEvent.ACTION_DOWN) {
//on recupére la carte a afficher en grand
DrawableCard smallCArd = renderer.getCardOn(unScalled_X,unScalled_Y);
@@ -143,12 +146,11 @@ public class TouchHandler {
}else if(event.getAction() == MotionEvent.ACTION_UP) {
int zone = playableZonesHandler.getHoveredZone(dragAndDropCard);
if(zone != -1)
if(zone != -1 && gameLogic.onCardPlayed(dragAndDropCard,zone))
{
dragAndDropCard.setOnBoard(true);
dragAndDropCard.setCoordinates((DrawableCard.getCardWith()+1)*zone,55F);
dragAndDropCard.setDraggable(false);
gameLogic.onCardPlayed(dragAndDropCard,zone);
}else{
if(dragAndDropCard != null)renderer.moveToDraw(originalPositionX,originalPositionY, dragAndDropCard.getName());
}
@@ -160,8 +162,6 @@ public class TouchHandler {
private void handSelectionHandler(MotionEvent event)
{
float unScalled_Y = event.getY() / GameActivity.screenHeight * 100;
float unScalled_X = event.getX() / GameActivity.screenWidth * 100;
DrawableCard smallCArd = renderer.getCardOn(unScalled_X,unScalled_Y);
if(event.getAction() == MotionEvent.ACTION_DOWN) {
if(cardSeletedInHand != null && !cardSeletedInHand.isOnBoard()){
@@ -178,4 +178,16 @@ public class TouchHandler {
}
}
}
private void endTurnButtonHandle(MotionEvent event)
{
//si on appuie
if(event.getAction() == MotionEvent.ACTION_DOWN &&
//si on est sur le boutton
unScalled_X > GameLogicThread.BUTTON_X_POS && unScalled_X < GameLogicThread.BUTTON_X_POS + GameLogicThread.BUTTON_X_SIZE &&
unScalled_Y > GameLogicThread.BUTTON_Y_POS && unScalled_Y < GameLogicThread.BUTTON_Y_POS + GameLogicThread.BUTTON_Y_SIZE)
{
gameLogic.onEndTurnButtonPushed();
}
}
}
app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableCard.java
+4
View File
@@ -350,4 +350,8 @@ public class DrawableCard extends Drawable{
public void setDraggable(Boolean draggable) {
this.draggable = draggable;
}
public Card getCard() {
return card;
}
}
app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableSelfRemoving.java
+5 -7
View File
@@ -5,22 +5,20 @@ import android.graphics.Paint;
import androidx.annotation.NonNull;
import java.time.Instant;
public class DrawableSelfRemoving extends Drawable{
private Drawable drawable;
private long lifetime;
private long lifespan;
public DrawableSelfRemoving(Drawable drawable,int lifetime) {
public DrawableSelfRemoving(Drawable drawable,int lifespan) {
super(drawable.getX(), drawable.getY(), drawable.getName());
this.drawable = drawable;
this.lifetime = System.currentTimeMillis()+lifetime*1000;
this.lifespan = System.currentTimeMillis()+lifespan*1000;
}
@Override
public void drawOn(@NonNull Canvas c, @NonNull Paint p) {
if(lifetime > System.currentTimeMillis())
if(lifespan > System.currentTimeMillis())
{
drawable.drawOn(c,p);
}
@@ -28,6 +26,6 @@ public class DrawableSelfRemoving extends Drawable{
public boolean isDone()
{
return lifetime < System.currentTimeMillis();
return lifespan < System.currentTimeMillis();
}
}
app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableText.java
+2
View File
@@ -23,6 +23,8 @@ public class DrawableText extends Drawable{
* @param name nom du Drawable
* @param x_size taille du drawable entre 0 et 100
* @param y_size taille du drawable entre 0 et 100
* @param y_canvasRatio taille du canevas en pixel sur le quel le texte va être dessiné /!\ doit être proportionnel a la police
* @param x_canvasRatio voire y_canvasRatio
*/
public DrawableText(String text,float x_pos,float y_pos,String name, float x_size,float y_size,float textSize , int x_canvasRatio, int y_canvasRatio)
{
app/src/main/java/com/iutlaval/myapplication/exception/UnrecognizedCard.java
+4
View File
@@ -0,0 +1,4 @@
package com.iutlaval.myapplication.exception;
public class UnrecognizedCard extends RuntimeException{
}
app/src/main/res/drawable-v24/t_c_pierre.png → app/src/main/res/drawable-v24/t_c_pierre_ermite.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 MiB

After

Width:  |  Height:  |  Size: 1.4 MiB

Some files were not shown because too many files have changed in this diff Show More