From 9cf62f4de30c0da9c7bc56ded96b8c4deb3fb252 Mon Sep 17 00:00:00 2001 From: Yan Maniez Date: Sun, 28 Apr 2019 19:52:46 +0200 Subject: [PATCH] =?UTF-8?q?D=C3=A9placement=20background=20view=20model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PlayerCharacter/BackgroundViewModel.cs | 140 +++++++++++- .../PlayerCharacterEditorViewModel.cs | 36 ++-- .../PlayerCharacterViewModel.cs | 201 +++--------------- 3 files changed, 189 insertions(+), 188 deletions(-) diff --git a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/BackgroundViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/BackgroundViewModel.cs index 40934613..c0b9ea84 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/BackgroundViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/BackgroundViewModel.cs @@ -8,9 +8,145 @@ namespace AideDeJeu.ViewModels.PlayerCharacter public class BackgroundViewModel : BaseViewModel { private BackgroundItem _Background = null; - public BackgroundItem Background { get { return _Background; } set { SetProperty(ref _Background, value); } } + public BackgroundItem Background { get { return _Background; } set { SetProperty(ref _Background, value); OnPropertyChanged(nameof(SelectedBackground)); } } private SubBackgroundItem _SubBackground = null; - public SubBackgroundItem SubBackground { get { return _SubBackground; } set { SetProperty(ref _SubBackground, value); } } + public SubBackgroundItem SubBackground { get { return _SubBackground; } set { SetProperty(ref _SubBackground, value); OnPropertyChanged(nameof(SelectedBackground)); } } + + public BackgroundItem SelectedBackground + { + get + { + return _SubBackground ?? _Background; + } + } + private string _PersonalityTrait = null; + public string PersonalityTrait + { + get + { + return _PersonalityTrait; + } + set + { + SetProperty(ref _PersonalityTrait, value); + } + } + private string _PersonalityIdeal = null; + public string PersonalityIdeal + { + get + { + return _PersonalityIdeal; + } + set + { + SetProperty(ref _PersonalityIdeal, value); + } + } + private string _PersonalityLink = null; + public string PersonalityLink + { + get + { + return _PersonalityLink; + } + set + { + SetProperty(ref _PersonalityLink, value); + } + } + private string _PersonalityDefect = null; + public string PersonalityDefect + { + get + { + return _PersonalityDefect; + } + set + { + SetProperty(ref _PersonalityDefect, value); + } + } + private string _BackgroundSpecialty = null; + public string BackgroundSpecialty + { + get + { + return _BackgroundSpecialty; + } + set + { + SetProperty(ref _BackgroundSpecialty, value); + OnPropertyChanged(nameof(SelectedBackgroundSpecialty)); + } + } + private string _SubBackgroundSpecialty = null; + public string SubBackgroundSpecialty + { + get + { + return _SubBackgroundSpecialty; + } + set + { + SetProperty(ref _SubBackgroundSpecialty, value); + OnPropertyChanged(nameof(SelectedBackgroundSpecialty)); + } + } + public string SelectedBackgroundSpecialty + { + get + { + return _SubBackgroundSpecialty ?? _BackgroundSpecialty; + } + } + + private string _PickedBackgroundSpecialty = null; + public string PickedBackgroundSpecialty + { + get + { + return _PickedBackgroundSpecialty; + } + set + { + SetProperty(ref _PickedBackgroundSpecialty, value); + } + } + + private SkillItem _BackgroundSkill = null; + public SkillItem BackgroundSkill + { + get + { + return _BackgroundSkill; + } + set + { + SetProperty(ref _BackgroundSkill, value); + OnPropertyChanged(nameof(SelectedBackgroundSkill)); + } + } + private SkillItem _SubBackgroundSkill = null; + public SkillItem SubBackgroundSkill + { + get + { + return _SubBackgroundSkill; + } + set + { + SetProperty(ref _SubBackgroundSkill, value); + OnPropertyChanged(nameof(SelectedBackgroundSkill)); + } + } + public SkillItem SelectedBackgroundSkill + { + get + { + return _SubBackgroundSkill ?? _BackgroundSkill; + } + } } } diff --git a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs index 80b3e50b..598d3605 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs @@ -47,7 +47,7 @@ namespace AideDeJeu.ViewModels.PlayerCharacter } #region Selected PC - private PlayerCharacterViewModel _SelectedPlayerCharacter = new PlayerCharacterViewModel(); + private PlayerCharacterViewModel _SelectedPlayerCharacter = new PlayerCharacterViewModel() { Background = new BackgroundViewModel() }; public PlayerCharacterViewModel SelectedPlayerCharacter { get @@ -130,10 +130,10 @@ namespace AideDeJeu.ViewModels.PlayerCharacter private void ResetAlignments() { Alignments = new NotifyTaskCompletion>(Task.Run(() => LoadAlignmentsAsync())); - if (!string.IsNullOrEmpty(SelectedPlayerCharacter.PersonalityIdeal)) + if (!string.IsNullOrEmpty(SelectedPlayerCharacter.Background.PersonalityIdeal)) { var regex = new Regex(".*\\((?.*?)\\)$"); - var match = regex.Match(SelectedPlayerCharacter.PersonalityIdeal); + var match = regex.Match(SelectedPlayerCharacter.Background.PersonalityIdeal); var alignment = match.Groups["alignment"].Value; if (!string.IsNullOrEmpty(alignment) && alignment.ToLower() != "tous") { @@ -240,13 +240,13 @@ namespace AideDeJeu.ViewModels.PlayerCharacter private async Task LoadBackgroundAsync(BackgroundItem background) { - SelectedPlayerCharacter.SubBackground = null; - SelectedPlayerCharacter.PersonalityTrait = null; - SelectedPlayerCharacter.PersonalityIdeal = null; - SelectedPlayerCharacter.PersonalityLink = null; - SelectedPlayerCharacter.PersonalityDefect = null; - SelectedPlayerCharacter.BackgroundSpecialty = null; - SelectedPlayerCharacter.Background = background; + SelectedPlayerCharacter.Background.SubBackground = null; + SelectedPlayerCharacter.Background.PersonalityTrait = null; + SelectedPlayerCharacter.Background.PersonalityIdeal = null; + SelectedPlayerCharacter.Background.PersonalityLink = null; + SelectedPlayerCharacter.Background.PersonalityDefect = null; + SelectedPlayerCharacter.Background.BackgroundSpecialty = null; + SelectedPlayerCharacter.Background.Background = background; if (background != null) { @@ -336,7 +336,7 @@ namespace AideDeJeu.ViewModels.PlayerCharacter private async Task LoadSubBackgroundAsync(SubBackgroundItem subbackground) { - SelectedPlayerCharacter.SubBackground = subbackground; + SelectedPlayerCharacter.Background.SubBackground = subbackground; if (subbackground == null) { SubBackgroundSpecialties = null; @@ -381,7 +381,7 @@ namespace AideDeJeu.ViewModels.PlayerCharacter set { SetProperty(ref _SelectedPersonalityTrait, value); - SelectedPlayerCharacter.PersonalityTrait = value; + SelectedPlayerCharacter.Background.PersonalityTrait = value; } } @@ -407,7 +407,7 @@ namespace AideDeJeu.ViewModels.PlayerCharacter set { SetProperty(ref _SelectedPersonalityIdeal, value); - SelectedPlayerCharacter.PersonalityIdeal = value; + SelectedPlayerCharacter.Background.PersonalityIdeal = value; } } @@ -433,7 +433,7 @@ namespace AideDeJeu.ViewModels.PlayerCharacter set { SetProperty(ref _SelectedPersonalityLink, value); - SelectedPlayerCharacter.PersonalityLink = value; + SelectedPlayerCharacter.Background.PersonalityLink = value; } } @@ -459,7 +459,7 @@ namespace AideDeJeu.ViewModels.PlayerCharacter set { SetProperty(ref _SelectedPersonalityDefect, value); - SelectedPlayerCharacter.PersonalityDefect = value; + SelectedPlayerCharacter.Background.PersonalityDefect = value; } } @@ -516,7 +516,7 @@ namespace AideDeJeu.ViewModels.PlayerCharacter set { SetProperty(ref _BackgroundSpecialty, value); - SelectedPlayerCharacter.BackgroundSpecialty = BackgroundSpecialty; + SelectedPlayerCharacter.Background.BackgroundSpecialty = BackgroundSpecialty; } } private string _SubBackgroundSpecialty = null; @@ -529,7 +529,7 @@ namespace AideDeJeu.ViewModels.PlayerCharacter set { SetProperty(ref _SubBackgroundSpecialty, value); - SelectedPlayerCharacter.SubBackgroundSpecialty = SubBackgroundSpecialty; + SelectedPlayerCharacter.Background.SubBackgroundSpecialty = SubBackgroundSpecialty; } } @@ -1190,7 +1190,7 @@ namespace AideDeJeu.ViewModels.PlayerCharacter form.SetField("Race", SelectedPlayerCharacter?.Race?.Name ?? string.Empty); form.SetField("Classe", SelectedPlayerCharacter?.Class?.Name ?? string.Empty); form.SetField("Alignement", SelectedPlayerCharacter?.Alignment?.Name ?? string.Empty); - form.SetField("Historique", SelectedPlayerCharacter?.Background?.Name ?? string.Empty); + form.SetField("Historique", SelectedPlayerCharacter?.Background?.Background?.Name ?? string.Empty); form.SetField("Trait de personnalité", (SelectedPersonalityTrait ?? string.Empty) + "\n\n" + (SelectedPersonalityIdeal ?? string.Empty) + "\n\n" + diff --git a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterViewModel.cs index 1fd81d58..4f132dbd 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterViewModel.cs @@ -44,27 +44,8 @@ namespace AideDeJeu.ViewModels.PlayerCharacter _Class.LoadDetailsAsync().ConfigureAwait(true); } } - //private BackgroundViewModel _Background = null; - //public BackgroundViewModel Background - //{ - // get - // { - // return _Background; - // } - // set - // { - // SetProperty(ref _Background, value); - // _Background.LoadDetailsAsync().ConfigureAwait(true); - // } - //} - - - - - - #region Background - private BackgroundItem _Background = null; - public BackgroundItem Background + private BackgroundViewModel _Background = null; + public BackgroundViewModel Background { get { @@ -73,157 +54,41 @@ namespace AideDeJeu.ViewModels.PlayerCharacter set { SetProperty(ref _Background, value); - OnPropertyChanged(nameof(SelectedBackground)); - } - } - private SubBackgroundItem _SubBackground = null; - public SubBackgroundItem SubBackground - { - get - { - return _SubBackground; - } - set - { - SetProperty(ref _SubBackground, value); - OnPropertyChanged(nameof(SelectedBackground)); - } - } - public BackgroundItem SelectedBackground - { - get - { - return _SubBackground ?? _Background; - } - } - private string _PersonalityTrait = null; - public string PersonalityTrait - { - get - { - return _PersonalityTrait; - } - set - { - SetProperty(ref _PersonalityTrait, value); - } - } - private string _PersonalityIdeal = null; - public string PersonalityIdeal - { - get - { - return _PersonalityIdeal; - } - set - { - SetProperty(ref _PersonalityIdeal, value); - } - } - private string _PersonalityLink = null; - public string PersonalityLink - { - get - { - return _PersonalityLink; - } - set - { - SetProperty(ref _PersonalityLink, value); - } - } - private string _PersonalityDefect = null; - public string PersonalityDefect - { - get - { - return _PersonalityDefect; - } - set - { - SetProperty(ref _PersonalityDefect, value); - } - } - private string _BackgroundSpecialty = null; - public string BackgroundSpecialty - { - get - { - return _BackgroundSpecialty; - } - set - { - SetProperty(ref _BackgroundSpecialty, value); - OnPropertyChanged(nameof(SelectedBackgroundSpecialty)); - } - } - private string _SubBackgroundSpecialty = null; - public string SubBackgroundSpecialty - { - get - { - return _SubBackgroundSpecialty; - } - set - { - SetProperty(ref _SubBackgroundSpecialty, value); - OnPropertyChanged(nameof(SelectedBackgroundSpecialty)); - } - } - public string SelectedBackgroundSpecialty - { - get - { - return _SubBackgroundSpecialty ?? _BackgroundSpecialty; + //_Background.LoadDetailsAsync().ConfigureAwait(true); } } - private string _PickedBackgroundSpecialty = null; - public string PickedBackgroundSpecialty - { - get - { - return _PickedBackgroundSpecialty; - } - set - { - SetProperty(ref _PickedBackgroundSpecialty, value); - } - } - private SkillItem _BackgroundSkill = null; - public SkillItem BackgroundSkill - { - get - { - return _BackgroundSkill; - } - set - { - SetProperty(ref _BackgroundSkill, value); - OnPropertyChanged(nameof(SelectedBackgroundSkill)); - } - } - private SkillItem _SubBackgroundSkill = null; - public SkillItem SubBackgroundSkill - { - get - { - return _SubBackgroundSkill; - } - set - { - SetProperty(ref _SubBackgroundSkill, value); - OnPropertyChanged(nameof(SelectedBackgroundSkill)); - } - } - public SkillItem SelectedBackgroundSkill - { - get - { - return _SubBackgroundSkill ?? _BackgroundSkill; - } - } + + + + #region Background + //private BackgroundItem _Background = null; + //public BackgroundItem Background + //{ + // get + // { + // return _Background; + // } + // set + // { + // SetProperty(ref _Background, value); + // OnPropertyChanged(nameof(SelectedBackground)); + // } + //} + //private SubBackgroundItem _SubBackground = null; + //public SubBackgroundItem SubBackground + //{ + // get + // { + // return _SubBackground; + // } + // set + // { + // SetProperty(ref _SubBackground, value); + // OnPropertyChanged(nameof(SelectedBackground)); + // } + //} #endregion Background } }