diff --git a/.vs/Ohara/v17/.wsuo b/.vs/Ohara/v17/.wsuo new file mode 100644 index 0000000..1fe81cc Binary files /dev/null and b/.vs/Ohara/v17/.wsuo differ diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 0000000..887098f --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,7 @@ +{ + "ExpandedNodes": [ + "" + ], + "SelectedNode": "\\Ohara.sln", + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/Sources/Model/Bateau.cs b/Sources/Model/Bateau.cs index 32d836d..bbc197c 100644 --- a/Sources/Model/Bateau.cs +++ b/Sources/Model/Bateau.cs @@ -10,13 +10,13 @@ namespace Model { public string Nom { get; set; } public string NomRomanise { get; set; } - public string Affiliation { get; set; } + public Equipage Affiliation { get; set; } public int PremierChap { get; set; } public int PremierEp { get; set; } public string Description { get; set; } public string Caracteristique { get; set; } - public Bateau(string nom, string nomRomanise, string affiliation, int premierChap, int premierEp, string description, string caracteristique) + public Bateau(string nom, string nomRomanise, Equipage affiliation, int premierChap, int premierEp, string description, string caracteristique) { Nom = nom; NomRomanise = nomRomanise; diff --git a/Sources/Model/Equipage.cs b/Sources/Model/Equipage.cs index 3764307..aaa2c10 100644 --- a/Sources/Model/Equipage.cs +++ b/Sources/Model/Equipage.cs @@ -10,27 +10,25 @@ namespace Model { public string Nom { get; set; } public string NomRomanise { get; set; } - public Personnage Capitaine { get; set; } + public string Region { get; set; } public int PremierChap { get; set; } public int PremierEp { get; set; } public bool Statut { get; set; } - public string Description { get; set; } - public Personnage Membre { get; set; } - public Personnage Allie { get; set; } + public string? Description { get; set; } + public Personnage Capitaine { get; set; } + public List Membre { get; set; } = new List(); + public List Allie { get; set; } = new List(); - public Equipage(string nom, string nomRomanise, Personnage capitaine, string region, int premierChap, int premierEp, bool statut, string description, Personnage membre, Personnage allie) + public Equipage(string nom, string nomRomanise, string region, int premierChap, int premierEp, bool statut,Personnage capitaine) { Nom = nom; NomRomanise = nomRomanise; - Capitaine = capitaine; Region = region; PremierChap = premierChap; PremierEp = premierEp; Statut = statut; - Description = description; - Membre = membre; - Allie = allie; + Capitaine = capitaine; } } } diff --git a/Sources/Model/FruitDuDemon.cs b/Sources/Model/FruitDuDemon.cs index 529fd4d..3ed6c65 100644 --- a/Sources/Model/FruitDuDemon.cs +++ b/Sources/Model/FruitDuDemon.cs @@ -16,9 +16,9 @@ namespace Model public string Description { get; set; } public string Forces { get; set; } public string Faiblesses { get; set; } - public Personnage Utilisateur { get; set; } + public List Utilisateur { get; set; }= new List(); - public FruitDuDemon(string nom, string nomRomanise, string type, int premierChap, int premierEp, string description, string forces, string faiblesses, Personnage utilisateur) + public FruitDuDemon(string nom, string nomRomanise, string type, int premierChap, int premierEp, string description, string forces, string faiblesses) { Nom = nom; NomRomanise = nomRomanise; @@ -28,6 +28,10 @@ namespace Model Description = description; Forces = forces; Faiblesses = faiblesses; + + } + public FruitDuDemon(string nom, string nomRomanise, string type, int premierChap, int premierEp, string description, string forces, string faiblesses, List utilisateur) : this( nom, nomRomanise, type, premierChap, premierEp, description, forces, faiblesses) + { Utilisateur = utilisateur; } } diff --git a/Sources/Model/Personnage.cs b/Sources/Model/Personnage.cs index 7a32f8e..58866af 100644 --- a/Sources/Model/Personnage.cs +++ b/Sources/Model/Personnage.cs @@ -5,27 +5,31 @@ public string Nom { get; set; } public string Epithete { get; set; } public int Age { get; set; } - public float Taille { get; set; } - public FruitDuDemon Fruit { get; set; } + public double Taille { get; set; } public string Origine { get; set; } - public string Equipage { get; set; } public string Biographie { get; set; } public string Citation { get; set; } + public Equipage? Equipage { get; set; } + public List Fruit { get; set; } = new List(); - public Personnage(string nom, string epithete, int age, float taille, FruitDuDemon fruit, string origine, string equipage, string biographie, string citation) + public Personnage(string nom, string epithete, int age, double taille, string origine, string biographie, string citation) { Nom = nom; Epithete = epithete; Age = age; Taille = taille; - Fruit = fruit; Origine = origine; - Equipage = equipage; Biographie = biographie; Citation = citation; } + public Personnage(string nom, string epithete, int age, double taille, string origine, string biographie, string citation,Equipage equipage,List fruit) : this(nom,epithete,age,taille,origine,biographie,citation) + { + Equipage = equipage; + Fruit = fruit; + + } } } \ No newline at end of file diff --git a/Sources/TestConsole/Program.cs b/Sources/TestConsole/Program.cs index 83fa4f4..ddb23c0 100644 --- a/Sources/TestConsole/Program.cs +++ b/Sources/TestConsole/Program.cs @@ -1,2 +1,25 @@ // See https://aka.ms/new-console-template for more information -Console.WriteLine("Hello, World!"); +using Model; + +FruitDuDemon nika = new FruitDuDemon("Fruit de l'humain modèle Nika", "Nika Nika No Mi", "Zoan Mythologique", 1, 1, "Le fruit ...", "Forces :", "Faiblesses :"); + +Personnage luffy = new Personnage("Monkey D. Luffy", "Chapeau de paille", 19,1.74,"East Blue","Monkey D. Luffy est...","Le Roi des Pirates ce sera moi !" ); +Personnage zoro = new Personnage("Roronoa Zoro", "Chasseur de pirates", 21, 1.81, "East Blue", "Roronoa Zoro est ...", "Le plus grand des racistes ce sera moi !"); +Personnage sanji = new Personnage("Sanji", "La jambe noire", 21, 1.80, "East Blue", "Sanji né Vinsmoke Sanji ..", "As-tu déjà entendu parler de All Blue ?"); + +Equipage mugi = new Equipage("Équipage au chapeau de paille","Mugiwara No Ichimi","East Blue",1,1,true,luffy); +nika.Utilisateur = new List { luffy }; +luffy.Fruit = new List { nika }; +luffy.Equipage= mugi; +zoro.Equipage = mugi; +sanji.Equipage = mugi; + +mugi.Membre = new List { luffy, zoro, sanji }; + +foreach(Personnage p in mugi.Membre) +{ + Console.WriteLine(p.Nom); + Console.WriteLine(p.Citation); + Console.WriteLine(p.Epithete); +} +Console.WriteLine(mugi.Capitaine.Nom); \ No newline at end of file