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 051f43f..3b55c41 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 @@ -60,36 +60,36 @@ 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_Charles; +import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Chatherine; +import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Chute_Constantinople; +import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Concile_Trente; +import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Constantin; import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Copernic; +import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Decouverte_Amerique; +import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Elisabeth; +import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Ferdinand; +import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Fin_Guerre_Cent_Ans; +import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Francois; +import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Guerres_Italie; +import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Henri; +import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Henri_8; +import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Isabelle; +import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Ivan; +import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Leonard; +import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Machiavel; import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Mehmet; +import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Michel_Ange; +import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Nobunaga; +import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Presse_Imprimer; +import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Rabelais; +import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Reforme; +import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Shakespeare; +import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Skanderberg; 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 com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Casimir; +import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Succession_Bourgogne; +import com.iutlaval.myapplication.Game.Cards.Renaissance.Renaissance_Vlad; import java.util.ArrayList; import java.util.List; @@ -138,36 +138,36 @@ public class CardRegistery { //Cartes du deck Rennaissance //créatures registry.add(Renaissance_Soliman.class); - registry.add(Rennaissance_Francois.class); - registry.add(Rennaissance_Charles.class); - registry.add(Rennaissance_Casimir.class); - registry.add(Rennaissance_Henri.class); - registry.add(Rennaissance_Henri_8.class); - registry.add(Rennaissance_Constantin.class); + registry.add(Renaissance_Francois.class); + registry.add(Renaissance_Charles.class); + registry.add(Renaissance_Casimir.class); + registry.add(Renaissance_Henri.class); + registry.add(Renaissance_Henri_8.class); + registry.add(Renaissance_Constantin.class); registry.add(Renaissance_Mehmet.class); registry.add(Renaissance_Copernic.class); - registry.add(Rennaissance_Leonard.class); - registry.add(Rennaissance_Michel_Ange.class); - registry.add(Rennaissance_Rabelais.class); - registry.add(Rennaissance_Machiavel.class); - registry.add(Rennaissance_Ivan.class); - registry.add(Rennaissance_Elisabeth.class); - registry.add(Rennaissance_Vlad.class); - registry.add(Rennaissance_Nobunaga.class); - registry.add(Rennaissance_Chatherine.class); - registry.add(Rennaissance_Ferdinand.class); - registry.add(Rennaissance_Isabelle.class); - registry.add(Rennaissance_Skanderberg.class); - registry.add(Rennaissance_Shakespeare.class); + registry.add(Renaissance_Leonard.class); + registry.add(Renaissance_Michel_Ange.class); + registry.add(Renaissance_Rabelais.class); + registry.add(Renaissance_Machiavel.class); + registry.add(Renaissance_Ivan.class); + registry.add(Renaissance_Elisabeth.class); + registry.add(Renaissance_Vlad.class); + registry.add(Renaissance_Nobunaga.class); + registry.add(Renaissance_Chatherine.class); + registry.add(Renaissance_Ferdinand.class); + registry.add(Renaissance_Isabelle.class); + registry.add(Renaissance_Skanderberg.class); + registry.add(Renaissance_Shakespeare.class); //sorts - registry.add(Rennaissance_Fin_Guerre_Cent_Ans.class); - registry.add(Rennaissance_Guerres_Italie.class); - registry.add(Rennaissance_Chute_Constantinople.class); - registry.add(Rennaissance_Presse_Imprimer.class); - registry.add(Rennaissance_Decouverte_Amerique.class); - registry.add(Rennaissance_Concile_Trente.class); - registry.add(Rennaissance_Succession_Bourgogne.class); - registry.add(Rennaissance_Reforme.class); + registry.add(Renaissance_Fin_Guerre_Cent_Ans.class); + registry.add(Renaissance_Guerres_Italie.class); + registry.add(Renaissance_Chute_Constantinople.class); + registry.add(Renaissance_Presse_Imprimer.class); + registry.add(Renaissance_Decouverte_Amerique.class); + registry.add(Renaissance_Concile_Trente.class); + registry.add(Renaissance_Succession_Bourgogne.class); + registry.add(Renaissance_Reforme.class); //Cartes du deck Moyen-age //créatures diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Casimir.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Casimir.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Casimir.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Casimir.java index f408e74..aaeee25 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Casimir.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Casimir.java @@ -5,14 +5,14 @@ import android.content.Context; import com.iutlaval.myapplication.Game.Cards.Card; import com.iutlaval.myapplication.R; -public class Rennaissance_Casimir extends Card { +public class Renaissance_Casimir extends Card { /** * cree une carte est lui definit un drawable * * @param UID * @param c */ - public Rennaissance_Casimir(String UID, Context c) { + public Renaissance_Casimir(String UID, Context c) { super(UID, c); } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Charles.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Charles.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Charles.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Charles.java index bfbfa7d..a4fad1d 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Charles.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Charles.java @@ -5,14 +5,14 @@ import android.content.Context; import com.iutlaval.myapplication.Game.Cards.Card; import com.iutlaval.myapplication.R; -public class Rennaissance_Charles extends Card { +public class Renaissance_Charles extends Card { /** * cree une carte est lui definit un drawable * * @param UID * @param c */ - public Rennaissance_Charles(String UID, Context c) { + public Renaissance_Charles(String UID, Context c) { super(UID, c); } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Chatherine.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Chatherine.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Chatherine.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Chatherine.java index c550dcc..bf8b6a7 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Chatherine.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Chatherine.java @@ -5,14 +5,14 @@ import android.content.Context; import com.iutlaval.myapplication.Game.Cards.Card; import com.iutlaval.myapplication.R; -public class Rennaissance_Chatherine extends Card { +public class Renaissance_Chatherine extends Card { /** * cree une carte est lui definit un drawable * * @param UID * @param c */ - public Rennaissance_Chatherine(String UID, Context c) { + public Renaissance_Chatherine(String UID, Context c) { super(UID, c); } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Chute_Constantinople.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Chute_Constantinople.java similarity index 93% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Chute_Constantinople.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Chute_Constantinople.java index 332e5ee..0cb4379 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Chute_Constantinople.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Chute_Constantinople.java @@ -5,14 +5,14 @@ import android.content.Context; import com.iutlaval.myapplication.Game.Cards.Card; import com.iutlaval.myapplication.R; -public class Rennaissance_Chute_Constantinople extends Card { +public class Renaissance_Chute_Constantinople extends Card { /** * cree une carte est lui definit un drawable * * @param UID * @param c */ - public Rennaissance_Chute_Constantinople(String UID, Context c) { + public Renaissance_Chute_Constantinople(String UID, Context c) { super(UID, c); } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Concile_Trente.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Concile_Trente.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Concile_Trente.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Concile_Trente.java index cc5a984..f0029cc 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Concile_Trente.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Concile_Trente.java @@ -5,14 +5,14 @@ import android.content.Context; import com.iutlaval.myapplication.Game.Cards.Card; import com.iutlaval.myapplication.R; -public class Rennaissance_Concile_Trente extends Card { +public class Renaissance_Concile_Trente extends Card { /** * cree une carte est lui definit un drawable * * @param UID * @param c */ - public Rennaissance_Concile_Trente(String UID, Context c) { + public Renaissance_Concile_Trente(String UID, Context c) { super(UID, c); } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Constantin.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Constantin.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Constantin.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Constantin.java index 1b1333b..4296adc 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Constantin.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Constantin.java @@ -5,14 +5,14 @@ import android.content.Context; import com.iutlaval.myapplication.Game.Cards.Card; import com.iutlaval.myapplication.R; -public class Rennaissance_Constantin extends Card { +public class Renaissance_Constantin extends Card { /** * cree une carte est lui definit un drawable * * @param UID * @param c */ - public Rennaissance_Constantin(String UID, Context c) { + public Renaissance_Constantin(String UID, Context c) { super(UID, c); } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Decouverte_Amerique.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Decouverte_Amerique.java similarity index 93% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Decouverte_Amerique.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Decouverte_Amerique.java index 2a7079f..ec9364a 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Decouverte_Amerique.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Decouverte_Amerique.java @@ -5,14 +5,14 @@ import android.content.Context; import com.iutlaval.myapplication.Game.Cards.Card; import com.iutlaval.myapplication.R; -public class Rennaissance_Decouverte_Amerique extends Card { +public class Renaissance_Decouverte_Amerique extends Card { /** * cree une carte est lui definit un drawable * * @param UID * @param c */ - public Rennaissance_Decouverte_Amerique(String UID, Context c) { + public Renaissance_Decouverte_Amerique(String UID, Context c) { super(UID, c); } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Elisabeth.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Elisabeth.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Elisabeth.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Elisabeth.java index 23e8916..28d64af 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Elisabeth.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Elisabeth.java @@ -5,14 +5,14 @@ import android.content.Context; import com.iutlaval.myapplication.Game.Cards.Card; import com.iutlaval.myapplication.R; -public class Rennaissance_Elisabeth extends Card { +public class Renaissance_Elisabeth extends Card { /** * cree une carte est lui definit un drawable * * @param UID * @param c */ - public Rennaissance_Elisabeth(String UID, Context c) { + public Renaissance_Elisabeth(String UID, Context c) { super(UID, c); } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Ferdinand.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Ferdinand.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Ferdinand.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Ferdinand.java index 3649d20..ece46b1 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Ferdinand.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Ferdinand.java @@ -5,14 +5,14 @@ import android.content.Context; import com.iutlaval.myapplication.Game.Cards.Card; import com.iutlaval.myapplication.R; -public class Rennaissance_Ferdinand extends Card { +public class Renaissance_Ferdinand extends Card { /** * cree une carte est lui definit un drawable * * @param UID * @param c */ - public Rennaissance_Ferdinand(String UID, Context c) { + public Renaissance_Ferdinand(String UID, Context c) { super(UID, c); } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Fin_Guerre_Cent_Ans.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Fin_Guerre_Cent_Ans.java similarity index 93% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Fin_Guerre_Cent_Ans.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Fin_Guerre_Cent_Ans.java index 4ee3a7e..fb3c448 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Fin_Guerre_Cent_Ans.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Fin_Guerre_Cent_Ans.java @@ -5,14 +5,14 @@ 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 { +public class Renaissance_Fin_Guerre_Cent_Ans extends Card { /** * cree une carte est lui definit un drawable * * @param UID * @param c */ - public Rennaissance_Fin_Guerre_Cent_Ans(String UID, Context c) { + public Renaissance_Fin_Guerre_Cent_Ans(String UID, Context c) { super(UID, c); } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Francois.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Francois.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Francois.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Francois.java index 7b89851..ba3dfab 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Francois.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Francois.java @@ -5,14 +5,14 @@ import android.content.Context; import com.iutlaval.myapplication.Game.Cards.Card; import com.iutlaval.myapplication.R; -public class Rennaissance_Francois extends Card { +public class Renaissance_Francois extends Card { /** * cree une carte est lui definit un drawable * * @param UID * @param c */ - public Rennaissance_Francois(String UID, Context c) { + public Renaissance_Francois(String UID, Context c) { super(UID, c); } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Guerres_Italie.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Guerres_Italie.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Guerres_Italie.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Guerres_Italie.java index 6ebda4a..59b3441 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Guerres_Italie.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Guerres_Italie.java @@ -5,14 +5,14 @@ import android.content.Context; import com.iutlaval.myapplication.Game.Cards.Card; import com.iutlaval.myapplication.R; -public class Rennaissance_Guerres_Italie extends Card { +public class Renaissance_Guerres_Italie extends Card { /** * cree une carte est lui definit un drawable * * @param UID * @param c */ - public Rennaissance_Guerres_Italie(String UID, Context c) { + public Renaissance_Guerres_Italie(String UID, Context c) { super(UID, c); } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Henri.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Henri.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Henri.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Henri.java index 45b1e63..659b983 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Henri.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Henri.java @@ -5,14 +5,14 @@ import android.content.Context; import com.iutlaval.myapplication.Game.Cards.Card; import com.iutlaval.myapplication.R; -public class Rennaissance_Henri extends Card { +public class Renaissance_Henri extends Card { /** * cree une carte est lui definit un drawable * * @param UID * @param c */ - public Rennaissance_Henri(String UID, Context c) { + public Renaissance_Henri(String UID, Context c) { super(UID, c); } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Henri_8.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Henri_8.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Henri_8.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Henri_8.java index 12084d2..b7f0107 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Henri_8.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Henri_8.java @@ -5,14 +5,14 @@ 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 Renaissance_Henri_8 extends Card { /** * cree une carte est lui definit un drawable * * @param UID * @param c */ - public Rennaissance_Henri_8(String UID, Context c) { + public Renaissance_Henri_8(String UID, Context c) { super(UID, c); } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Isabelle.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Isabelle.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Isabelle.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Isabelle.java index 72a0804..bf03eca 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Isabelle.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Isabelle.java @@ -5,14 +5,14 @@ import android.content.Context; import com.iutlaval.myapplication.Game.Cards.Card; import com.iutlaval.myapplication.R; -public class Rennaissance_Isabelle extends Card { +public class Renaissance_Isabelle extends Card { /** * cree une carte est lui definit un drawable * * @param UID * @param c */ - public Rennaissance_Isabelle(String UID, Context c) { + public Renaissance_Isabelle(String UID, Context c) { super(UID, c); } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Ivan.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Ivan.java similarity index 95% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Ivan.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Ivan.java index 0b42fb6..2b8fef0 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Ivan.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Ivan.java @@ -5,14 +5,14 @@ import android.content.Context; import com.iutlaval.myapplication.Game.Cards.Card; import com.iutlaval.myapplication.R; -public class Rennaissance_Ivan extends Card { +public class Renaissance_Ivan extends Card { /** * cree une carte est lui definit un drawable * * @param UID * @param c */ - public Rennaissance_Ivan(String UID, Context c) { + public Renaissance_Ivan(String UID, Context c) { super(UID, c); } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Leonard.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Leonard.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Leonard.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Leonard.java index c869193..ed937bd 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Leonard.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Leonard.java @@ -5,14 +5,14 @@ import android.content.Context; import com.iutlaval.myapplication.Game.Cards.Card; import com.iutlaval.myapplication.R; -public class Rennaissance_Leonard extends Card { +public class Renaissance_Leonard extends Card { /** * cree une carte est lui definit un drawable * * @param UID * @param c */ - public Rennaissance_Leonard(String UID, Context c) { + public Renaissance_Leonard(String UID, Context c) { super(UID, c); } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Machiavel.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Machiavel.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Machiavel.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Machiavel.java index b9e7cf9..ec8bd6b 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Machiavel.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Machiavel.java @@ -5,14 +5,14 @@ import android.content.Context; import com.iutlaval.myapplication.Game.Cards.Card; import com.iutlaval.myapplication.R; -public class Rennaissance_Machiavel extends Card { +public class Renaissance_Machiavel extends Card { /** * cree une carte est lui definit un drawable * * @param UID * @param c */ - public Rennaissance_Machiavel(String UID, Context c) { + public Renaissance_Machiavel(String UID, Context c) { super(UID, c); } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Michel_Ange.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Michel_Ange.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Michel_Ange.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Michel_Ange.java index 03d8aff..a792f6e 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Michel_Ange.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Michel_Ange.java @@ -5,14 +5,14 @@ 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 Renaissance_Michel_Ange extends Card { /** * cree une carte est lui definit un drawable * * @param UID * @param c */ - public Rennaissance_Michel_Ange(String UID, Context c) { + public Renaissance_Michel_Ange(String UID, Context c) { super(UID, c); } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Nobunaga.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Nobunaga.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Nobunaga.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Nobunaga.java index de8843e..6d2aaab 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Nobunaga.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Nobunaga.java @@ -5,14 +5,14 @@ import android.content.Context; import com.iutlaval.myapplication.Game.Cards.Card; import com.iutlaval.myapplication.R; -public class Rennaissance_Nobunaga extends Card { +public class Renaissance_Nobunaga extends Card { /** * cree une carte est lui definit un drawable * * @param UID * @param c */ - public Rennaissance_Nobunaga(String UID, Context c) { + public Renaissance_Nobunaga(String UID, Context c) { super(UID, c); } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Presse_Imprimer.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Presse_Imprimer.java similarity index 93% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Presse_Imprimer.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Presse_Imprimer.java index 6945638..e8a03c4 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Presse_Imprimer.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Presse_Imprimer.java @@ -5,7 +5,7 @@ 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 Renaissance_Presse_Imprimer extends Card { /** * cree une carte est lui definit un drawable @@ -13,7 +13,7 @@ public class Rennaissance_Presse_Imprimer extends Card { * @param UID * @param c */ - public Rennaissance_Presse_Imprimer(String UID, Context c) { + public Renaissance_Presse_Imprimer(String UID, Context c) { super(UID, c); } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Rabelais.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Rabelais.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Rabelais.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Rabelais.java index ecd8c91..3812eaa 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Rabelais.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Rabelais.java @@ -5,7 +5,7 @@ import android.content.Context; import com.iutlaval.myapplication.Game.Cards.Card; import com.iutlaval.myapplication.R; -public class Rennaissance_Rabelais extends Card { +public class Renaissance_Rabelais extends Card { /** * cree une carte est lui definit un drawable @@ -13,7 +13,7 @@ public class Rennaissance_Rabelais extends Card { * @param UID * @param c */ - public Rennaissance_Rabelais(String UID, Context c) { + public Renaissance_Rabelais(String UID, Context c) { super(UID, c); } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Reforme.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Reforme.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Reforme.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Reforme.java index 5f34526..1b6c496 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Reforme.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Reforme.java @@ -5,7 +5,7 @@ import android.content.Context; import com.iutlaval.myapplication.Game.Cards.Card; import com.iutlaval.myapplication.R; -public class Rennaissance_Reforme extends Card { +public class Renaissance_Reforme extends Card { /** * cree une carte est lui definit un drawable @@ -13,7 +13,7 @@ public class Rennaissance_Reforme extends Card { * @param UID * @param c */ - public Rennaissance_Reforme(String UID, Context c) { + public Renaissance_Reforme(String UID, Context c) { super(UID, c); } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Shakespeare.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Shakespeare.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Shakespeare.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Shakespeare.java index 6145fc4..c99b143 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Shakespeare.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Shakespeare.java @@ -5,14 +5,14 @@ import android.content.Context; import com.iutlaval.myapplication.Game.Cards.Card; import com.iutlaval.myapplication.R; -public class Rennaissance_Shakespeare extends Card { +public class Renaissance_Shakespeare extends Card { /** * cree une carte est lui definit un drawable * * @param UID * @param c */ - public Rennaissance_Shakespeare(String UID, Context c) { + public Renaissance_Shakespeare(String UID, Context c) { super(UID, c); } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Skanderberg.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Skanderberg.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Skanderberg.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Skanderberg.java index acb6c94..6a9f15e 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Skanderberg.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Skanderberg.java @@ -5,7 +5,7 @@ import android.content.Context; import com.iutlaval.myapplication.Game.Cards.Card; import com.iutlaval.myapplication.R; -public class Rennaissance_Skanderberg extends Card { +public class Renaissance_Skanderberg extends Card { /** * cree une carte est lui definit un drawable @@ -13,7 +13,7 @@ public class Rennaissance_Skanderberg extends Card { * @param UID * @param c */ - public Rennaissance_Skanderberg(String UID, Context c) { + public Renaissance_Skanderberg(String UID, Context c) { super(UID, c); } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Succession_Bourgogne.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Succession_Bourgogne.java similarity index 94% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Succession_Bourgogne.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Succession_Bourgogne.java index 9d7288c..6e0f1d5 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Succession_Bourgogne.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Succession_Bourgogne.java @@ -5,14 +5,14 @@ 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 Renaissance_Succession_Bourgogne extends Card { /** * cree une carte est lui definit un drawable * * @param UID * @param c */ - public Rennaissance_Succession_Bourgogne(String UID, Context c) { + public Renaissance_Succession_Bourgogne(String UID, Context c) { super(UID, c); } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Vlad.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Vlad.java similarity index 95% rename from app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Vlad.java rename to app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Vlad.java index 4527f7e..a5da6db 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Rennaissance_Vlad.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Vlad.java @@ -5,14 +5,14 @@ import android.content.Context; import com.iutlaval.myapplication.Game.Cards.Card; import com.iutlaval.myapplication.R; -public class Rennaissance_Vlad extends Card { +public class Renaissance_Vlad extends Card { /** * cree une carte est lui definit un drawable * * @param UID * @param c */ - public Rennaissance_Vlad(String UID, Context c) { + public Renaissance_Vlad(String UID, Context c) { super(UID, c); }