From 64bd6411f7503e57c2c36492f8ac5f8f2d2d2b4c Mon Sep 17 00:00:00 2001 From: Yan Maniez Date: Thu, 23 May 2019 14:07:20 +0200 Subject: [PATCH] Correctif --- AideDeJeu/AideDeJeu/Models/Items/Item.cs | 2 +- .../ViewModels/PlayerCharacter/BackgroundViewModel.cs | 10 +++++----- .../PlayerCharacter/PlayerCharacterEditorViewModel.cs | 2 +- AideDeJeu/AideDeJeu/ViewModels/StoreViewModel.cs | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/AideDeJeu/AideDeJeu/Models/Items/Item.cs b/AideDeJeu/AideDeJeu/Models/Items/Item.cs index f56aa82d..eafd0c31 100644 --- a/AideDeJeu/AideDeJeu/Models/Items/Item.cs +++ b/AideDeJeu/AideDeJeu/Models/Items/Item.cs @@ -226,7 +226,7 @@ namespace AideDeJeuLib { "PersonalityDefectItem", typeof(PersonalityDefectItem) }, { "BackgroundSpecialtyItem", typeof(BackgroundSpecialtyItem) }, { "BackgroundItem", typeof(BackgroundItem) }, - { "SkillItem", typeof(SkillItem) }, + { "FeatureItem", typeof(FeatureItem) }, { "ClassEquipmentItem", typeof(ClassEquipmentItem) }, { "ClassEvolutionItem", typeof(ClassEvolutionItem) }, { "ClassFeatureItem", typeof(ClassFeatureItem) }, diff --git a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/BackgroundViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/BackgroundViewModel.cs index 9ea68922..ae18f156 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/BackgroundViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/BackgroundViewModel.cs @@ -103,8 +103,8 @@ namespace AideDeJeu.ViewModels.PlayerCharacter SetProperty(ref _BackgroundSpecialty, value); } } - private SkillItem _BackgroundSkill = null; - public SkillItem BackgroundSkill + private FeatureItem _BackgroundSkill = null; + public FeatureItem BackgroundSkill { get { @@ -116,8 +116,8 @@ namespace AideDeJeu.ViewModels.PlayerCharacter OnPropertyChanged(nameof(BackgroundOrSubBackgroundSkill)); } } - private SkillItem _SubBackgroundSkill = null; - public SkillItem SubBackgroundSkill + private FeatureItem _SubBackgroundSkill = null; + public FeatureItem SubBackgroundSkill { get { @@ -129,7 +129,7 @@ namespace AideDeJeu.ViewModels.PlayerCharacter OnPropertyChanged(nameof(BackgroundOrSubBackgroundSkill)); } } - public SkillItem BackgroundOrSubBackgroundSkill + public FeatureItem BackgroundOrSubBackgroundSkill { get { diff --git a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs index 6989bd66..ce923271 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs @@ -763,7 +763,7 @@ namespace AideDeJeu.ViewModels.PlayerCharacter } } - public async Task LoadSkillAsync(BackgroundItem background) + public async Task LoadSkillAsync(BackgroundItem background) { if (background != null) { diff --git a/AideDeJeu/AideDeJeu/ViewModels/StoreViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/StoreViewModel.cs index 9fe05a6a..011e9443 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/StoreViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/StoreViewModel.cs @@ -728,7 +728,7 @@ namespace AideDeJeu.ViewModels modelBuilder.Entity(); modelBuilder.Entity(); modelBuilder.Entity(); - modelBuilder.Entity(); + modelBuilder.Entity(); modelBuilder.Entity(); modelBuilder.Entity(); modelBuilder.Entity();