diff --git a/Sources/ConsoleApp/FileName.cs b/Sources/ConsoleApp/FileName.cs index 26e9d95..7f1c623 100644 --- a/Sources/ConsoleApp/FileName.cs +++ b/Sources/ConsoleApp/FileName.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Reflection.Emit; using System.Runtime.InteropServices; using System.Text; using System.Threading.Tasks; @@ -25,7 +26,9 @@ namespace ConsoleApp */ Carte C = new Carte("Villageois", "Aucuns", "Doit voter inteligemment", null, "lien", "une carte peu apprécié mais necesaire"); + Pack P = new Pack("Jeu de base", "C'est la premiere version du jeu", 5); Console.WriteLine(C.Nom); + Console.WriteLine(P.Nom); } static void DisplayTab(string name, int[] tab) diff --git a/Sources/Model/Carte.cs b/Sources/Model/Carte.cs index d9d5027..06e02c0 100644 --- a/Sources/Model/Carte.cs +++ b/Sources/Model/Carte.cs @@ -72,6 +72,7 @@ namespace Model OnPropertyChanged(nameof(LienImage)); } } + public IEnumerable ContenuList { get; set; } private string lienImage; public Carte(string nom, string pouvoir, string strategie, int? note, string lienImage, string description) { @@ -80,7 +81,8 @@ namespace Model this.pouvoir = pouvoir; this.strategie = strategie; this.note = note; - this.lienImage = LienImage; + this.lienImage = lienImage; + this.ContenuList = new List(); } } } diff --git a/Sources/Model/Commentaire.cs b/Sources/Model/Commentaire.cs index e31f114..fb4e7af 100644 --- a/Sources/Model/Commentaire.cs +++ b/Sources/Model/Commentaire.cs @@ -10,12 +10,10 @@ namespace Model { public string Texte { get; set; } public Utilisateur Proprietaire { get; set; } - public IContenu ContenuCommente { get; set; } - public Commentaire(string Texte, Utilisateur Proprietaire, IContenu ContenuCommente) + public Commentaire(string Texte, Utilisateur Proprietaire) { this.Texte = Texte; this.Proprietaire = Proprietaire; - this.ContenuCommente = ContenuCommente; } } } diff --git a/Sources/Model/Pack.cs b/Sources/Model/Pack.cs new file mode 100644 index 0000000..79efae0 --- /dev/null +++ b/Sources/Model/Pack.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.ComponentModel; +using System.Runtime.CompilerServices; + +namespace Model +{ + public class Pack : IContenu, INotifyPropertyChanged + { + public event PropertyChangedEventHandler? PropertyChanged; + void OnPropertyChanged([CallerMemberName] string? propertyName = null) + { + PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); + } + + public string Nom { get; set; } + public string Description { get; set; } + private int? note; + public int? Note + { + get + { + return note; + } + set + { + if (value < 0 || value > 10) + { + throw new ArgumentOutOfRangeException(nameof(value), "La valeur de la note doit être comprise entre 0 et 10."); + } + note = value; + OnPropertyChanged(nameof(Note)); + } + } + public Pack(string nom, string description, int? note) + { + Nom = nom; + Description = description; + Note = note; + } + } +}