diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/CardRegistery.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/CardRegistery.java index c351c77..051f43f 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/CardRegistery.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/CardRegistery.java @@ -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()); + } } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Charlemagne.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Charlemagne.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Charlemagne.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Charlemagne.java index dff2c1b..ffee4aa 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Charlemagne.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Charlemagne.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_CharlesV.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_CharlesV.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_CharlesV.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_CharlesV.java index 40514ff..86ffd89 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_CharlesV.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_CharlesV.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_CharlesVII.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_CharlesVII.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_CharlesVII.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_CharlesVII.java index c71b7e5..546a7cb 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_CharlesVII.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_CharlesVII.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Chretien_De_Troyes.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Chretien_De_Troyes.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Chretien_De_Troyes.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Chretien_De_Troyes.java index 886108a..2a2257b 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Chretien_De_Troyes.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Chretien_De_Troyes.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Christine.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Christine.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Christine.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Christine.java index 04d4cbe..b01603e 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Christine.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Christine.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Clovis.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Clovis.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Clovis.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Clovis.java index e286de8..433314d 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Clovis.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Clovis.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Croisade.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Croisade.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Croisade.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Croisade.java index 923d675..a50175c 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Croisade.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Croisade.java @@ -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 diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Etienne.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Etienne.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Etienne.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Etienne.java index 94d6203..42abfd7 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Etienne.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Etienne.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Ferré.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Ferré.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Ferré.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Ferré.java index c7dde10..3356b82 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Ferré.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Ferré.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Guerre_100.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Guerre_100.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Guerre_100.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Guerre_100.java index 785ce0e..959cf11 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Guerre_100.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Guerre_100.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Guillaume.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Guillaume.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Guillaume.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Guillaume.java index 02a2663..d3b2660 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Guillaume.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Guillaume.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Heresie_Cathares.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Heresie_Cathares.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Heresie_Cathares.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Heresie_Cathares.java index f75ec3e..cb20dbf 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Heresie_Cathares.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Heresie_Cathares.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Hugue.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Hugue.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Hugue.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Hugue.java index 7cb7f41..7650dca 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Hugue.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Hugue.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Isabelle.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Isabelle.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Isabelle.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Isabelle.java index 22e9b76..9f42ab6 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Isabelle.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Isabelle.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Jean.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Jean.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Jean.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Jean.java index 32449cd..c376d16 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Jean.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Jean.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Jean_Vienne.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Jean_Vienne.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Jean_Vienne.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Jean_Vienne.java index 2863c58..964835f 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Jean_Vienne.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Jean_Vienne.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Jeanne.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Jeanne.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Jeanne.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Jeanne.java index d3393c0..1897674 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Jeanne.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Jeanne.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Louis.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Louis.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Louis.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Louis.java index 24ecdf1..0d5a977 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Louis.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Louis.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Malediction_Templier.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Malediction_Templier.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Malediction_Templier.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Malediction_Templier.java index 8e17853..5215ddd 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Malediction_Templier.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Malediction_Templier.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Peste.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Peste.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Peste.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Peste.java index b61a375..2236bd1 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Peste.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Peste.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Philippe.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Philippe.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Philippe.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Philippe.java index bf6d396..6bb5b33 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Philippe.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Philippe.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_PhilippeIV.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_PhilippeIV.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_PhilippeIV.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_PhilippeIV.java index 197d6f9..6e615cf 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_PhilippeIV.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_PhilippeIV.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Philippe_Cacqueray.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Philippe_Cacqueray.java similarity index 91% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Philippe_Cacqueray.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Philippe_Cacqueray.java index acba9de..38c1957 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Philippe_Cacqueray.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Philippe_Cacqueray.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Pierre.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pierre.java similarity index 90% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Pierre.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pierre.java index eb34e17..0428b9f 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Pierre.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pierre.java @@ -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; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Pierre_Ermite.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pierre_Ermite.java similarity index 89% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Pierre_Ermite.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pierre_Ermite.java index 39719cc..0a2bf50 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Pierre_Ermite.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pierre_Ermite.java @@ -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; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Pouvoir_Du_Franc.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pouvoir_Du_Franc.java similarity index 91% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Pouvoir_Du_Franc.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pouvoir_Du_Franc.java index d95185f..bd0a506 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Pouvoir_Du_Franc.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Pouvoir_Du_Franc.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Prise_Sainte_Terre.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Prise_Sainte_Terre.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Prise_Sainte_Terre.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Prise_Sainte_Terre.java index 209c984..67cf721 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Prise_Sainte_Terre.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Prise_Sainte_Terre.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Roland.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Roland.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Roland.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Roland.java index 3e83bb0..af09366 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Roland.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Roland.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Sire_Jean.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Sire_Jean.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Sire_Jean.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Sire_Jean.java index 5004235..b0c6086 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Sire_Jean.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Sire_Jean.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Traite_Verdun.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Traite_Verdun.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Traite_Verdun.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Traite_Verdun.java index ecedda1..fd9c699 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Moyen_Age_Traite_Verdun.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/MoyenAge/Moyen_Age_Traite_Verdun.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_12_Travaux.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_12_Travaux.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_12_Travaux.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_12_Travaux.java index f213ad6..ec71867 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_12_Travaux.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_12_Travaux.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Achille.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Achille.java similarity index 93% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Achille.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Achille.java index 82a3d7c..58d6a27 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Achille.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Achille.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Amazones.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Amazones.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Amazones.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Amazones.java index 57347ab..e25cd25 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Amazones.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Amazones.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Castor_Pollux.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Castor_Pollux.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Castor_Pollux.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Castor_Pollux.java index edb741f..88bc60e 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Castor_Pollux.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Castor_Pollux.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Chant_Sirene.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Chant_Sirene.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Chant_Sirene.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Chant_Sirene.java index 8d39891..ce311f1 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Chant_Sirene.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Chant_Sirene.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Chaos.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Chaos.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Chaos.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Chaos.java index a599dcd..e27279c 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Chaos.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Chaos.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Cheval_Troie.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Cheval_Troie.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Cheval_Troie.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Cheval_Troie.java index b1fbda7..091649c 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Cheval_Troie.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Cheval_Troie.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Chiron.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Chiron.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Chiron.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Chiron.java index f8902e7..5288fd7 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Chiron.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Chiron.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Dédale.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Dédale.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Dédale.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Dédale.java index 0e8065a..90a4f11 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Dédale.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Dédale.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Enigme_Sphinx.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Enigme_Sphinx.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Enigme_Sphinx.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Enigme_Sphinx.java index f15c839..3926fc3 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Enigme_Sphinx.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Enigme_Sphinx.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Eole.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Eole.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Eole.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Eole.java index 68527f2..e906ee5 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Eole.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Eole.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Erinyes.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Erinyes.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Erinyes.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Erinyes.java index b976a19..6189114 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Erinyes.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Erinyes.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Guerre_Sept_Chefs.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Guerre_Sept_Chefs.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Guerre_Sept_Chefs.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Guerre_Sept_Chefs.java index 0bf727c..cda4496 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Guerre_Sept_Chefs.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Guerre_Sept_Chefs.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Hades.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Hades.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Hades.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Hades.java index 4a47cca..cc85d86 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Hades.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Hades.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Heracles.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Heracles.java similarity index 93% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Heracles.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Heracles.java index fe3ece3..36c3715 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Heracles.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Heracles.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Hermione.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Hermione.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Hermione.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Hermione.java index 27397f8..5092cbe 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Hermione.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Hermione.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Icar.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Icar.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Icar.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Icar.java index 82b81d1..ebebc34 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Icar.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Icar.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Kunée.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Kunée.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Kunée.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Kunée.java index a1caf82..4f73907 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Kunée.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Kunée.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Minos.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Minos.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Minos.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Minos.java index a4e78f7..a94af3e 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Minos.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Minos.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Oedipie.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Oedipie.java similarity index 93% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Oedipie.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Oedipie.java index c1a4034..afa4664 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Oedipie.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Oedipie.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Perséphone.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Perséphone.java similarity index 87% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Perséphone.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Perséphone.java index 71476f8..068d9ef 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Perséphone.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Perséphone.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Poseidon.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Poseidon.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Poseidon.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Poseidon.java index e0315a3..890a1d5 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Poseidon.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Poseidon.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Psyché.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Psyché.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Psyché.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Psyché.java index 44d53f1..063e4b9 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Psyché.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Psyché.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Rapt.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Rapt.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Rapt.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Rapt.java index b9b5c09..5b52fe8 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Rapt.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Rapt.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Sémélé.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Sémélé.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Sémélé.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Sémélé.java index 805502d..b6403dd 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Sémélé.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Sémélé.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Thanatos.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Thanatos.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Thanatos.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Thanatos.java index 129b626..3151a70 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Thanatos.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Thanatos.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Titanomachie.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Titanomachie.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Titanomachie.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Titanomachie.java index f8d05b3..6ed817e 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Titanomachie.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Titanomachie.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Toison.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Toison.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Toison.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Toison.java index 20f123a..70bf489 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Toison.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Toison.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Zeus.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Zeus.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Zeus.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Zeus.java index 1103c45..5e75ef8 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Zeus.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Zeus.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Zeus_VS_Typhon.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Zeus_VS_Typhon.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Zeus_VS_Typhon.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Zeus_VS_Typhon.java index e7540a3..920537d 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes_Zeus_VS_Typhon.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Zeus_VS_Typhon.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance_Copernic.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Copernic.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance_Copernic.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Copernic.java index c17a90a..41003c4 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance_Copernic.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Copernic.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance_Mehmet.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Mehmet.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance_Mehmet.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Mehmet.java index b2a7e8d..f352c33 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance_Mehmet.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Mehmet.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance_Soliman.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Soliman.java similarity index 90% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance_Soliman.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Soliman.java index 08197dc..462c516 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance_Soliman.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Soliman.java @@ -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 { diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Casimir.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Casimir.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Casimir.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Casimir.java index 5d4dbed..f408e74 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Casimir.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Casimir.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Charles.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Charles.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Charles.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Charles.java index 5c96f18..bfbfa7d 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Charles.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Charles.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Chatherine.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Chatherine.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Chatherine.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Chatherine.java index d2c1917..c550dcc 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Chatherine.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Chatherine.java @@ -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 { diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Chute_Constantinople.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Chute_Constantinople.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Chute_Constantinople.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Chute_Constantinople.java index ff320d9..332e5ee 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Chute_Constantinople.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Chute_Constantinople.java @@ -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 { diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Concile_Trente.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Concile_Trente.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Concile_Trente.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Concile_Trente.java index e29eda8..cc5a984 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Concile_Trente.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Concile_Trente.java @@ -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 { diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Constantin.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Constantin.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Constantin.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Constantin.java index 027fc00..1b1333b 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Constantin.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Constantin.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Decouverte_Amerique.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Decouverte_Amerique.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Decouverte_Amerique.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Decouverte_Amerique.java index 620256e..2a7079f 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Decouverte_Amerique.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Decouverte_Amerique.java @@ -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 { diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Elisabeth.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Elisabeth.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Elisabeth.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Elisabeth.java index 9166f44..23e8916 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Elisabeth.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Elisabeth.java @@ -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 { diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Ferdinand.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Ferdinand.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Ferdinand.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Ferdinand.java index fa11c0f..3649d20 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Ferdinand.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Ferdinand.java @@ -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 { diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Fin_Guerre_Cent_Ans.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Fin_Guerre_Cent_Ans.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Fin_Guerre_Cent_Ans.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Fin_Guerre_Cent_Ans.java index 743b2dc..4ee3a7e 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Fin_Guerre_Cent_Ans.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Fin_Guerre_Cent_Ans.java @@ -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 { diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Francois.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Francois.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Francois.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Francois.java index 2242984..7b89851 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Francois.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Francois.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Guerres_Italie.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Guerres_Italie.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Guerres_Italie.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Guerres_Italie.java index b6e9c69..6ebda4a 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Guerres_Italie.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Guerres_Italie.java @@ -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 { diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Henri.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Henri.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Henri.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Henri.java index ce30905..45b1e63 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Henri.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Henri.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Henri_8.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Henri_8.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Henri_8.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Henri_8.java index 9ad128b..12084d2 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Henri_8.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Henri_8.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Isabelle.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Isabelle.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Isabelle.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Isabelle.java index 44552c5..72a0804 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Isabelle.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Isabelle.java @@ -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 { diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Ivan.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Ivan.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Ivan.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Ivan.java index bce4096..0b42fb6 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Ivan.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Ivan.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Leonard.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Leonard.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Leonard.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Leonard.java index 77e8746..c869193 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Leonard.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Leonard.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Machiavel.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Machiavel.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Machiavel.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Machiavel.java index c4968f8..b9e7cf9 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Machiavel.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Machiavel.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Michel_Ange.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Michel_Ange.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Michel_Ange.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Michel_Ange.java index 073631e..03d8aff 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Michel_Ange.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Michel_Ange.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Nobunaga.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Nobunaga.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Nobunaga.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Nobunaga.java index c31c2ee..de8843e 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Nobunaga.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Nobunaga.java @@ -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 { diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Presse_Imprimer.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Presse_Imprimer.java similarity index 91% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Presse_Imprimer.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Presse_Imprimer.java index f46d7d1..6945638 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Presse_Imprimer.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Presse_Imprimer.java @@ -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 diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Rabelais.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Rabelais.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Rabelais.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Rabelais.java index b6e8a2d..ecd8c91 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Rabelais.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Rabelais.java @@ -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 diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Reforme.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Reforme.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Reforme.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Reforme.java index 1329f2a..5f34526 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Reforme.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Reforme.java @@ -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 { diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Shakespeare.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Shakespeare.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Shakespeare.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Shakespeare.java index 46a120c..6145fc4 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Shakespeare.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Shakespeare.java @@ -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 { diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Skanderberg.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Skanderberg.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Skanderberg.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Skanderberg.java index 142b383..acb6c94 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Skanderberg.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Skanderberg.java @@ -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 { diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Succession_Bourgogne.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Succession_Bourgogne.java similarity index 92% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Succession_Bourgogne.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Succession_Bourgogne.java index a974628..9d7288c 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Succession_Bourgogne.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Succession_Bourgogne.java @@ -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 * diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Vlad.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Vlad.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Vlad.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Vlad.java index 5556a7f..4527f7e 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Rennaissance_Vlad.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Vlad.java @@ -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 { diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/COMMAND.java b/app/src/main/java/com/iutlaval/myapplication/Game/Command.java similarity index 58% rename from app/src/main/java/com/iutlaval/myapplication/Game/COMMAND.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Command.java index f433113..0dab0c0 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/COMMAND.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Command.java @@ -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"; } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java b/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java index 0f7fe22..d4e07d8 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java @@ -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() - { + 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(); + } } - - @Override - public void run() { - super.run(); - } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/NetworkDeck.java b/app/src/main/java/com/iutlaval/myapplication/Game/NetworkDeck.java index 068e33a..fa06113 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/NetworkDeck.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/NetworkDeck.java @@ -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; diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/TouchHandler.java b/app/src/main/java/com/iutlaval/myapplication/Game/TouchHandler.java index 7b061f1..462e390 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/TouchHandler.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/TouchHandler.java @@ -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(); + } + } } diff --git a/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableCard.java b/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableCard.java index 0907e49..71ffca8 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableCard.java +++ b/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableCard.java @@ -350,4 +350,8 @@ public class DrawableCard extends Drawable{ public void setDraggable(Boolean draggable) { this.draggable = draggable; } + + public Card getCard() { + return card; + } } diff --git a/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableSelfRemoving.java b/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableSelfRemoving.java index acde6c4..67633f7 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableSelfRemoving.java +++ b/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableSelfRemoving.java @@ -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(); } } diff --git a/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableText.java b/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableText.java index 40242f2..78678df 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableText.java +++ b/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableText.java @@ -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) { diff --git a/app/src/main/java/com/iutlaval/myapplication/exception/UnrecognizedCard.java b/app/src/main/java/com/iutlaval/myapplication/exception/UnrecognizedCard.java new file mode 100644 index 0000000..64d454f --- /dev/null +++ b/app/src/main/java/com/iutlaval/myapplication/exception/UnrecognizedCard.java @@ -0,0 +1,4 @@ +package com.iutlaval.myapplication.exception; + +public class UnrecognizedCard extends RuntimeException{ +} diff --git a/app/src/main/res/drawable-v24/t_c_pierre.png b/app/src/main/res/drawable-v24/t_c_pierre_ermite.png similarity index 100% rename from app/src/main/res/drawable-v24/t_c_pierre.png rename to app/src/main/res/drawable-v24/t_c_pierre_ermite.png diff --git a/app/src/main/res/drawable/t_btn_boutonfintour.png b/app/src/main/res/drawable/t_btn_boutonfintour.png new file mode 100644 index 0000000..6aafbd0 Binary files /dev/null and b/app/src/main/res/drawable/t_btn_boutonfintour.png differ