From 96e9170746fb40c2dd6df2e39296a5e9023c2ccd Mon Sep 17 00:00:00 2001
From: Piranha91 <piranha9191@gmail.com>
Date: Fri, 1 Dec 2023 02:34:33 -0800
Subject: [PATCH] Added "Distribute to non-forced NPCs" toggle to whole-config
 rules

---
 .../ViewModels/VM_ConfigDistributionRules.cs  | 45 ++++++------
 .../Views/UC_ConfigDistributionRules.xaml     | 70 ++++++++++---------
 SynthEBD/Classes_Core/Models/AssetPack.cs     |  2 +
 .../Classes_Core/ViewModels/VM_AssetPack.cs   |  2 +-
 .../Patcher/Asset Patching/AssetSelector.cs   | 12 ++--
 5 files changed, 70 insertions(+), 61 deletions(-)

diff --git a/SynthEBD/Classes_Aux/ViewModels/VM_ConfigDistributionRules.cs b/SynthEBD/Classes_Aux/ViewModels/VM_ConfigDistributionRules.cs
index d669c814..086406e6 100644
--- a/SynthEBD/Classes_Aux/ViewModels/VM_ConfigDistributionRules.cs
+++ b/SynthEBD/Classes_Aux/ViewModels/VM_ConfigDistributionRules.cs
@@ -89,6 +89,7 @@ public VM_ConfigDistributionRules(ObservableCollection<VM_RaceGrouping> raceGrou
     public VM_RaceGroupingCheckboxList DisallowedRaceGroupings { get; set; }
     public ObservableCollection<VM_NPCAttribute> AllowedAttributes { get; set; } = new();
     public ObservableCollection<VM_NPCAttribute> DisallowedAttributes { get; set; } = new();
+    public bool DistributionEnabled { get; set; } = true;
     public bool AllowUnique { get; set; } = true;
     public bool AllowNonUnique { get; set; } = true;
     public ObservableCollection<VM_CollectionMemberString> AddKeywords { get; set; } = new();
@@ -122,6 +123,7 @@ public void CopyInViewModelFromModel(AssetPack.ConfigDistributionRules model, Ob
             _attributeCreator.CopyInFromModels(model.AllowedAttributes, AllowedAttributes, parentAssetPack.AttributeGroupMenu.Groups, true, null);
             _attributeCreator.CopyInFromModels(model.DisallowedAttributes, DisallowedAttributes, parentAssetPack.AttributeGroupMenu.Groups, false, null);
             foreach (var x in DisallowedAttributes) { x.DisplayForceIfOption = false; }
+            DistributionEnabled = model.DistributionEnabled;
             AllowUnique = model.AllowUnique;
             AllowNonUnique = model.AllowNonUnique;
             VM_CollectionMemberString.CopyInObservableCollectionFromICollection(model.AddKeywords, AddKeywords);
@@ -139,30 +141,31 @@ public void CopyInViewModelFromModel(AssetPack.ConfigDistributionRules model, Ob
         }
     }
 
-    public static AssetPack.ConfigDistributionRules DumpViewModelToModel(VM_ConfigDistributionRules viewModel)
+    public AssetPack.ConfigDistributionRules DumpViewModelToModel()
     {
         var model = new AssetPack.ConfigDistributionRules();
 
-        model.AllowedRaces = viewModel.AllowedRaces.ToHashSet();
-        model.AllowedRaceGroupings = viewModel.AllowedRaceGroupings.RaceGroupingSelections.Where(x => x.IsSelected).Select(x => x.SubscribedMasterRaceGrouping.Label).ToHashSet();
-        model.DisallowedRaces = viewModel.DisallowedRaces.ToHashSet();
-        model.DisallowedRaceGroupings = viewModel.DisallowedRaceGroupings.RaceGroupingSelections.Where(x => x.IsSelected).Select(x => x.SubscribedMasterRaceGrouping.Label).ToHashSet();
-        model.AllowedAttributes = VM_NPCAttribute.DumpViewModelsToModels(viewModel.AllowedAttributes);
-        model.DisallowedAttributes = VM_NPCAttribute.DumpViewModelsToModels(viewModel.DisallowedAttributes);
-        model.AllowUnique = viewModel.AllowUnique;
-        model.AllowNonUnique = viewModel.AllowNonUnique;
-        model.AddKeywords = viewModel.AddKeywords.Select(x => x.Content).ToHashSet();
-        model.ProbabilityWeighting = viewModel.ProbabilityWeighting;
-        model.WeightRange = viewModel.WeightRange;
-
-        model.AllowedBodyGenDescriptors = viewModel.AllowedBodyGenDescriptors?.DumpToHashSet() ?? null;
-        model.AllowedBodyGenMatchMode = viewModel.AllowedBodyGenDescriptors?.MatchMode ?? DescriptorMatchMode.All;
-        model.DisallowedBodyGenDescriptors = viewModel.DisallowedBodyGenDescriptors?.DumpToHashSet() ?? null;
-        model.DisallowedBodyGenMatchMode = viewModel.DisallowedBodyGenDescriptors?.MatchMode ?? DescriptorMatchMode.Any;
-        model.AllowedBodySlideDescriptors = viewModel.AllowedBodySlideDescriptors.DumpToHashSet();
-        model.AllowedBodySlideMatchMode = viewModel.AllowedBodySlideDescriptors.MatchMode;
-        model.DisallowedBodySlideDescriptors = viewModel.DisallowedBodySlideDescriptors.DumpToHashSet();
-        model.DisallowedBodySlideMatchMode = viewModel.DisallowedBodySlideDescriptors.MatchMode;
+        model.AllowedRaces = AllowedRaces.ToHashSet();
+        model.AllowedRaceGroupings = AllowedRaceGroupings.RaceGroupingSelections.Where(x => x.IsSelected).Select(x => x.SubscribedMasterRaceGrouping.Label).ToHashSet();
+        model.DisallowedRaces = DisallowedRaces.ToHashSet();
+        model.DisallowedRaceGroupings = DisallowedRaceGroupings.RaceGroupingSelections.Where(x => x.IsSelected).Select(x => x.SubscribedMasterRaceGrouping.Label).ToHashSet();
+        model.AllowedAttributes = VM_NPCAttribute.DumpViewModelsToModels(AllowedAttributes);
+        model.DisallowedAttributes = VM_NPCAttribute.DumpViewModelsToModels(DisallowedAttributes);
+        model.DistributionEnabled = DistributionEnabled;
+        model.AllowUnique = AllowUnique;
+        model.AllowNonUnique = AllowNonUnique;
+        model.AddKeywords = AddKeywords.Select(x => x.Content).ToHashSet();
+        model.ProbabilityWeighting = ProbabilityWeighting;
+        model.WeightRange = WeightRange;
+
+        model.AllowedBodyGenDescriptors = AllowedBodyGenDescriptors?.DumpToHashSet() ?? new();
+        model.AllowedBodyGenMatchMode = AllowedBodyGenDescriptors?.MatchMode ?? DescriptorMatchMode.All;
+        model.DisallowedBodyGenDescriptors = DisallowedBodyGenDescriptors?.DumpToHashSet() ?? new();
+        model.DisallowedBodyGenMatchMode = DisallowedBodyGenDescriptors?.MatchMode ?? DescriptorMatchMode.Any;
+        model.AllowedBodySlideDescriptors = AllowedBodySlideDescriptors.DumpToHashSet();
+        model.AllowedBodySlideMatchMode = AllowedBodySlideDescriptors.MatchMode;
+        model.DisallowedBodySlideDescriptors = DisallowedBodySlideDescriptors.DumpToHashSet();
+        model.DisallowedBodySlideMatchMode = DisallowedBodySlideDescriptors.MatchMode;
 
         return model;
     }
diff --git a/SynthEBD/Classes_Aux/Views/UC_ConfigDistributionRules.xaml b/SynthEBD/Classes_Aux/Views/UC_ConfigDistributionRules.xaml
index c432f263..bdd8f4a8 100644
--- a/SynthEBD/Classes_Aux/Views/UC_ConfigDistributionRules.xaml
+++ b/SynthEBD/Classes_Aux/Views/UC_ConfigDistributionRules.xaml
@@ -36,25 +36,29 @@
                 <RowDefinition Height="auto"/>
                 <RowDefinition Height="auto"/>
                 <RowDefinition Height="auto"/>
+                <RowDefinition Height="auto"/>
             </Grid.RowDefinitions>
 
-            <TextBlock Grid.Row="0" Grid.Column="0" Margin="0 0 15 0" VerticalAlignment="Center">Allow Unique NPCs</TextBlock>
-            <CheckBox Grid.Row="0" Grid.Column="1" IsChecked="{Binding Path=AllowUnique, Mode=TwoWay}"></CheckBox>
+            <TextBlock Grid.Row="0" Grid.Column="0" Margin="0 0 15 0" VerticalAlignment="Center">Distribute to non-forced NPCs</TextBlock>
+            <CheckBox Grid.Row="0" Grid.Column="1" IsChecked="{Binding Path=DistributionEnabled, Mode=TwoWay}"></CheckBox>
+            
+            <TextBlock Grid.Row="1" Grid.Column="0" Margin="0 0 15 0" VerticalAlignment="Center">Allow Unique NPCs</TextBlock>
+            <CheckBox Grid.Row="1" Grid.Column="1" IsChecked="{Binding Path=AllowUnique, Mode=TwoWay}"></CheckBox>
 
-            <TextBlock Grid.Row="1" Grid.Column="0" Margin="0 0 15 0" VerticalAlignment="Center">Allow Non-Unique NPCs</TextBlock>
-            <CheckBox Grid.Row="1" Grid.Column="1" IsChecked="{Binding Path=AllowNonUnique, Mode=TwoWay}"></CheckBox>
+            <TextBlock Grid.Row="2" Grid.Column="0" Margin="0 0 15 0" VerticalAlignment="Center">Allow Non-Unique NPCs</TextBlock>
+            <CheckBox Grid.Row="2" Grid.Column="1" IsChecked="{Binding Path=AllowNonUnique, Mode=TwoWay}"></CheckBox>
 
-            <TextBlock Grid.Row="2" Grid.Column="0" Margin="0 0 15 0" VerticalAlignment="Center" Text="{Binding ProbabilityLabelStr}" />
-            <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal" >
+            <TextBlock Grid.Row="3" Grid.Column="0" Margin="0 0 15 0" VerticalAlignment="Center" Text="{Binding ProbabilityLabelStr}" />
+            <StackPanel Grid.Row="3" Grid.Column="1" Orientation="Horizontal" >
                 <TextBox MinWidth="150" TextAlignment="Left" PreviewTextInput="NumericOnly" Text="{Binding Path=ProbabilityWeighting}"/>
                 <TextBlock Text="%" VerticalAlignment="Center" Visibility="{Binding Path = bIsMixIn, Converter={StaticResource BoolToVis}}"/>
             </StackPanel>
 
-            <TextBlock Grid.Row="3" Grid.Column="0" Margin="0 0 15 0" VerticalAlignment="Center">Allowed Races</TextBlock>
-            <plugins:FormKeyMultiPicker MaxHeight="500" Grid.Row="3" Grid.Column="1" MinWidth="150" FormKeys="{Binding AllowedRaces}" LinkCache="{Binding LinkCache}" ScopedTypes="{Binding RacePickerFormKeys}" />
+            <TextBlock Grid.Row="4" Grid.Column="0" Margin="0 0 15 0" VerticalAlignment="Center">Allowed Races</TextBlock>
+            <plugins:FormKeyMultiPicker MaxHeight="500" Grid.Row="4" Grid.Column="1" MinWidth="150" FormKeys="{Binding AllowedRaces}" LinkCache="{Binding LinkCache}" ScopedTypes="{Binding RacePickerFormKeys}" />
 
-            <TextBlock Grid.Row="4" Grid.Column="0" Margin="0 0 15 0" VerticalAlignment="Center">Allowed Race Groupings</TextBlock>
-            <ContentPresenter Grid.Row="4" Grid.Column="1"  Content="{Binding AllowedRaceGroupings}">
+            <TextBlock Grid.Row="5" Grid.Column="0" Margin="0 0 15 0" VerticalAlignment="Center">Allowed Race Groupings</TextBlock>
+            <ContentPresenter Grid.Row="5" Grid.Column="1"  Content="{Binding AllowedRaceGroupings}">
                 <ContentPresenter.Resources>
                     <DataTemplate DataType="{x:Type local:VM_RaceGroupingCheckboxList}">
                         <local:UC_RaceGroupingCheckboxList Background="Black" Margin="0 0 0 10"/>
@@ -62,11 +66,11 @@
                 </ContentPresenter.Resources>
             </ContentPresenter>
 
-            <TextBlock Grid.Row="5" Grid.Column="0" Margin="0 0 15 0" VerticalAlignment="Center">Disallowed Races</TextBlock>
-            <plugins:FormKeyMultiPicker MaxHeight="500" Grid.Row="5" Grid.Column="1" MinWidth="150" FormKeys="{Binding DisallowedRaces}" LinkCache="{Binding LinkCache}" ScopedTypes="{Binding RacePickerFormKeys}" />
+            <TextBlock Grid.Row="6" Grid.Column="0" Margin="0 0 15 0" VerticalAlignment="Center">Disallowed Races</TextBlock>
+            <plugins:FormKeyMultiPicker MaxHeight="500" Grid.Row="6" Grid.Column="1" MinWidth="150" FormKeys="{Binding DisallowedRaces}" LinkCache="{Binding LinkCache}" ScopedTypes="{Binding RacePickerFormKeys}" />
 
-            <TextBlock Grid.Row="6" Grid.Column="0" Margin="0 0 15 0" VerticalAlignment="Center">Disallowed Race Groupings</TextBlock>
-            <ContentPresenter Grid.Row="6" Grid.Column="1"  Content="{Binding DisallowedRaceGroupings}">
+            <TextBlock Grid.Row="7" Grid.Column="0" Margin="0 0 15 0" VerticalAlignment="Center">Disallowed Race Groupings</TextBlock>
+            <ContentPresenter Grid.Row="7" Grid.Column="1"  Content="{Binding DisallowedRaceGroupings}">
                 <ContentPresenter.Resources>
                     <DataTemplate DataType="{x:Type local:VM_RaceGroupingCheckboxList}">
                         <local:UC_RaceGroupingCheckboxList Background="Black" Margin="0 0 0 10"/>
@@ -74,10 +78,10 @@
                 </ContentPresenter.Resources>
             </ContentPresenter>
 
-            <TextBlock Grid.Row="7" Grid.Column="0" Margin="0 0 15 0">Allowed NPC Attributes</TextBlock>
-            <Button Grid.Row="7" Grid.Column="0" Width="75" Height="20" VerticalAlignment="Top" HorizontalAlignment="Right" Command="{Binding AddAllowedAttribute}" Foreground="Lightgreen">Add New</Button>
+            <TextBlock Grid.Row="8" Grid.Column="0" Margin="0 0 15 0">Allowed NPC Attributes</TextBlock>
+            <Button Grid.Row="8" Grid.Column="0" Width="75" Height="20" VerticalAlignment="Top" HorizontalAlignment="Right" Command="{Binding AddAllowedAttribute}" Foreground="Lightgreen">Add New</Button>
 
-            <ItemsControl Grid.Row="7" Grid.Column="1" ItemsSource="{Binding AllowedAttributes}" BorderThickness="1" BorderBrush="#5844b4">
+            <ItemsControl Grid.Row="8" Grid.Column="1" ItemsSource="{Binding AllowedAttributes}" BorderThickness="1" BorderBrush="#5844b4">
                 <ItemsControl.ItemTemplate>
                     <DataTemplate DataType="{x:Type local:VM_NPCAttribute}">
                         <local:UC_NPCAttribute Background="Black" Margin="0 0 0 10"/>
@@ -85,9 +89,9 @@
                 </ItemsControl.ItemTemplate>
             </ItemsControl>
 
-            <TextBlock Grid.Row="8" Grid.Column="0" Margin="0 0 15 0">Disallowed NPC Attributes</TextBlock>
-            <Button Grid.Row="8" Grid.Column="0" Width="75" Height="20" VerticalAlignment="Top" HorizontalAlignment="Right" Command="{Binding AddDisallowedAttribute}" Foreground="Lightgreen">Add New</Button>
-            <ItemsControl Grid.Row="8" Grid.Column="1" ItemsSource="{Binding DisallowedAttributes}" BorderThickness="1" BorderBrush="#5844b4">
+            <TextBlock Grid.Row="9" Grid.Column="0" Margin="0 0 15 0">Disallowed NPC Attributes</TextBlock>
+            <Button Grid.Row="9" Grid.Column="0" Width="75" Height="20" VerticalAlignment="Top" HorizontalAlignment="Right" Command="{Binding AddDisallowedAttribute}" Foreground="Lightgreen">Add New</Button>
+            <ItemsControl Grid.Row="9" Grid.Column="1" ItemsSource="{Binding DisallowedAttributes}" BorderThickness="1" BorderBrush="#5844b4">
                 <ItemsControl.ItemTemplate>
                     <DataTemplate DataType="{x:Type local:VM_NPCAttribute}">
                         <local:UC_NPCAttribute Background="Black" Margin="0 0 0 10"/>
@@ -95,16 +99,16 @@
                 </ItemsControl.ItemTemplate>
             </ItemsControl>
 
-            <TextBlock Grid.Row="9" Grid.Column="0" Margin="0 0 15 0">Allowed NPC Weight Range</TextBlock>
-            <StackPanel Grid.Row="9" Grid.Column="1" Orientation="Horizontal">
+            <TextBlock Grid.Row="10" Grid.Column="0" Margin="0 0 15 0">Allowed NPC Weight Range</TextBlock>
+            <StackPanel Grid.Row="10" Grid.Column="1" Orientation="Horizontal">
                 <TextBox MinWidth="50" TextAlignment="Left" PreviewTextInput="NumericOnly" Text="{Binding Path=WeightRange.Lower}"/>
                 <TextBlock Text="to" Margin="15 0 15 0" VerticalAlignment="Center"/>
                 <TextBox MinWidth="50" TextAlignment="Left" PreviewTextInput="NumericOnly" Text="{Binding Path=WeightRange.Upper}"/>
             </StackPanel>
 
-            <TextBlock Grid.Row="10" Grid.Column="0" Margin="0 0 15 0">Add Keywords to NPC</TextBlock>
-            <Button Grid.Row="10" Grid.Column="0" Width="75" Height="20" VerticalAlignment="Top" HorizontalAlignment="Right" Command="{Binding AddNPCKeyword}" Foreground="Lightgreen">Add New</Button>
-            <ListBox Grid.Row="10" Grid.Column="1" ItemsSource="{Binding AddKeywords}" IsSynchronizedWithCurrentItem="True" BorderThickness="1" BorderBrush="#5844b4">
+            <TextBlock Grid.Row="11" Grid.Column="0" Margin="0 0 15 0">Add Keywords to NPC</TextBlock>
+            <Button Grid.Row="11" Grid.Column="0" Width="75" Height="20" VerticalAlignment="Top" HorizontalAlignment="Right" Command="{Binding AddNPCKeyword}" Foreground="Lightgreen">Add New</Button>
+            <ListBox Grid.Row="11" Grid.Column="1" ItemsSource="{Binding AddKeywords}" IsSynchronizedWithCurrentItem="True" BorderThickness="1" BorderBrush="#5844b4">
                 <ListBox.ItemTemplate>
                     <DataTemplate>
                         <StackPanel Orientation="Horizontal">
@@ -116,18 +120,18 @@
             </ListBox>
 
             <!--BodyGen-->
-            <TextBlock Grid.Row="11" Grid.Column="0" Margin="0 0 15 0" VerticalAlignment="Top" Visibility="{Binding ParentAssetPack.BodyShapeMode, Converter={StaticResource BGVisibilityConverter}}" ToolTip="Body shape descriptors that a BodyGen morph must have to be paired with this asset pack" ToolTipService.IsEnabled="{Binding Source={x:Static local:TooltipController.Instance}, Path=DisplayToolTips}">Allowed BodyGen Descriptors</TextBlock>
-            <local:UC_BodyShapeDescriptorSelectionMenu Grid.Row="11" Grid.Column="1" Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=DataContext.ParentAssetPack.BodyShapeMode, Converter={StaticResource BGVisibilityConverter}}" DataContext="{Binding AllowedBodyGenDescriptors}"/>
+            <TextBlock Grid.Row="12" Grid.Column="0" Margin="0 0 15 0" VerticalAlignment="Top" Visibility="{Binding ParentAssetPack.BodyShapeMode, Converter={StaticResource BGVisibilityConverter}}" ToolTip="Body shape descriptors that a BodyGen morph must have to be paired with this asset pack" ToolTipService.IsEnabled="{Binding Source={x:Static local:TooltipController.Instance}, Path=DisplayToolTips}">Allowed BodyGen Descriptors</TextBlock>
+            <local:UC_BodyShapeDescriptorSelectionMenu Grid.Row="12" Grid.Column="1" Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=DataContext.ParentAssetPack.BodyShapeMode, Converter={StaticResource BGVisibilityConverter}}" DataContext="{Binding AllowedBodyGenDescriptors}"/>
 
-            <TextBlock Grid.Row="12" Grid.Column="0" Margin="0 0 15 0" VerticalAlignment="Top" Visibility="{Binding ParentAssetPack.BodyShapeMode, Converter={StaticResource BGVisibilityConverter}}" ToolTip="Body shape descriptors that a BodyGen morph may not have if it is to be paired with this asset pack" ToolTipService.IsEnabled="{Binding Source={x:Static local:TooltipController.Instance}, Path=DisplayToolTips}">Disallowed BodyGen Descriptors</TextBlock>
-            <local:UC_BodyShapeDescriptorSelectionMenu Grid.Row="12" Grid.Column="1"  Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=DataContext.ParentAssetPack.BodyShapeMode, Converter={StaticResource BGVisibilityConverter}}" DataContext="{Binding DisallowedBodyGenDescriptors}" />
+            <TextBlock Grid.Row="13" Grid.Column="0" Margin="0 0 15 0" VerticalAlignment="Top" Visibility="{Binding ParentAssetPack.BodyShapeMode, Converter={StaticResource BGVisibilityConverter}}" ToolTip="Body shape descriptors that a BodyGen morph may not have if it is to be paired with this asset pack" ToolTipService.IsEnabled="{Binding Source={x:Static local:TooltipController.Instance}, Path=DisplayToolTips}">Disallowed BodyGen Descriptors</TextBlock>
+            <local:UC_BodyShapeDescriptorSelectionMenu Grid.Row="13" Grid.Column="1"  Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=DataContext.ParentAssetPack.BodyShapeMode, Converter={StaticResource BGVisibilityConverter}}" DataContext="{Binding DisallowedBodyGenDescriptors}" />
 
             <!--OBody-->
-            <TextBlock Grid.Row="11" Grid.Column="0" Margin="0 0 15 0" VerticalAlignment="Top" Visibility="{Binding ParentAssetPack.BodyShapeMode, Converter={StaticResource BSVisibilityConverter}}" ToolTip="Body shape descriptors that a BodySlide must have to be paired with this asset pack" ToolTipService.IsEnabled="{Binding Source={x:Static local:TooltipController.Instance}, Path=DisplayToolTips}">Allowed BodySlide Descriptors</TextBlock>
-            <local:UC_BodyShapeDescriptorSelectionMenu Grid.Row="11" Grid.Column="1"  Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=DataContext.ParentAssetPack.BodyShapeMode, Converter={StaticResource BSVisibilityConverter}}" DataContext="{Binding AllowedBodySlideDescriptors}"/>
+            <TextBlock Grid.Row="12" Grid.Column="0" Margin="0 0 15 0" VerticalAlignment="Top" Visibility="{Binding ParentAssetPack.BodyShapeMode, Converter={StaticResource BSVisibilityConverter}}" ToolTip="Body shape descriptors that a BodySlide must have to be paired with this asset pack" ToolTipService.IsEnabled="{Binding Source={x:Static local:TooltipController.Instance}, Path=DisplayToolTips}">Allowed BodySlide Descriptors</TextBlock>
+            <local:UC_BodyShapeDescriptorSelectionMenu Grid.Row="12" Grid.Column="1"  Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=DataContext.ParentAssetPack.BodyShapeMode, Converter={StaticResource BSVisibilityConverter}}" DataContext="{Binding AllowedBodySlideDescriptors}"/>
 
-            <TextBlock Grid.Row="12" Grid.Column="0" Margin="0 0 15 0" VerticalAlignment="Top" Visibility="{Binding ParentAssetPack.BodyShapeMode, Converter={StaticResource BSVisibilityConverter}}" ToolTip="Body shape descriptors that a BodySlide may not have if it is to be paired with this asset pack" ToolTipService.IsEnabled="{Binding Source={x:Static local:TooltipController.Instance}, Path=DisplayToolTips}">Disallowed BodySlide Descriptors</TextBlock>
-            <local:UC_BodyShapeDescriptorSelectionMenu Grid.Row="12" Grid.Column="1"  Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=DataContext.ParentAssetPack.BodyShapeMode, Converter={StaticResource BSVisibilityConverter}}" DataContext="{Binding DisallowedBodySlideDescriptors}"/>
+            <TextBlock Grid.Row="13" Grid.Column="0" Margin="0 0 15 0" VerticalAlignment="Top" Visibility="{Binding ParentAssetPack.BodyShapeMode, Converter={StaticResource BSVisibilityConverter}}" ToolTip="Body shape descriptors that a BodySlide may not have if it is to be paired with this asset pack" ToolTipService.IsEnabled="{Binding Source={x:Static local:TooltipController.Instance}, Path=DisplayToolTips}">Disallowed BodySlide Descriptors</TextBlock>
+            <local:UC_BodyShapeDescriptorSelectionMenu Grid.Row="13" Grid.Column="1"  Visibility="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}}, Path=DataContext.ParentAssetPack.BodyShapeMode, Converter={StaticResource BSVisibilityConverter}}" DataContext="{Binding DisallowedBodySlideDescriptors}"/>
         </Grid>
     </ScrollViewer>
 </UserControl>
diff --git a/SynthEBD/Classes_Core/Models/AssetPack.cs b/SynthEBD/Classes_Core/Models/AssetPack.cs
index 00fab091..431841ea 100644
--- a/SynthEBD/Classes_Core/Models/AssetPack.cs
+++ b/SynthEBD/Classes_Core/Models/AssetPack.cs
@@ -43,6 +43,7 @@ public class ConfigDistributionRules : IProbabilityWeighted
         public HashSet<string> DisallowedRaceGroupings { get; set; } = new();
         public HashSet<NPCAttribute> AllowedAttributes { get; set; } = new();
         public HashSet<NPCAttribute> DisallowedAttributes { get; set; } = new();
+        public bool DistributionEnabled { get; set; } = true;
         public bool AllowUnique { get; set; } = true;
         public bool AllowNonUnique { get; set; } = true;
         public HashSet<string> AddKeywords { get; set; } = new();
@@ -71,6 +72,7 @@ public static AssetPack.Subgroup CreateInheritanceParent(ConfigDistributionRules
             subgroup.DisallowedRaceGroupings = new HashSet<string>(rules.DisallowedRaceGroupings ?? new());
             subgroup.AllowedAttributes = new HashSet<NPCAttribute>(rules.AllowedAttributes ?? new());
             subgroup.DisallowedAttributes = new HashSet<NPCAttribute>(rules.DisallowedAttributes ?? new());
+            subgroup.DistributionEnabled = rules.DistributionEnabled;
             subgroup.AllowUnique = rules.AllowUnique;
             subgroup.AllowNonUnique = rules.AllowNonUnique;
             subgroup.AddKeywords = new HashSet<string>(rules.AddKeywords ?? new());
diff --git a/SynthEBD/Classes_Core/ViewModels/VM_AssetPack.cs b/SynthEBD/Classes_Core/ViewModels/VM_AssetPack.cs
index fa573f06..47c6aeec 100644
--- a/SynthEBD/Classes_Core/ViewModels/VM_AssetPack.cs
+++ b/SynthEBD/Classes_Core/ViewModels/VM_AssetPack.cs
@@ -585,7 +585,7 @@ public AssetPack DumpViewModelToModel()
 
         model.ReplacerGroups = VM_AssetPackDirectReplacerMenu.DumpViewModelToModels(ReplacersMenu);
 
-        model.DistributionRules = VM_ConfigDistributionRules.DumpViewModelToModel(DistributionRules);
+        model.DistributionRules = DistributionRules.DumpViewModelToModel();
 
         model.InstallationToken = InstallationToken;
         model.FilePath = SourcePath;
diff --git a/SynthEBD/Patcher/Asset Patching/AssetSelector.cs b/SynthEBD/Patcher/Asset Patching/AssetSelector.cs
index 88e9598f..57843b66 100644
--- a/SynthEBD/Patcher/Asset Patching/AssetSelector.cs	
+++ b/SynthEBD/Patcher/Asset Patching/AssetSelector.cs	
@@ -601,7 +601,7 @@ public HashSet<FlattenedAssetPack> FilterValidConfigsForNPC(HashSet<FlattenedAss
                 _logger.LogReport("Skipped evaluation of Whole Config Distribution Rules for Asset Pack " + ap.GroupName + " because it is forced by Specific NPC Assignments.", false, npcInfo);
                 filteredByMainConfigRules.Add(candidatePack);
             }
-            else if (!SubgroupValidForCurrentNPC(candidatePack.DistributionRules, npcInfo, mode, assignedBodyGen, assignedBodySlides)) // check distribution rules for whole config
+            else if (!SubgroupValidForCurrentNPC(candidatePack.DistributionRules, npcInfo, mode, assignedBodyGen, assignedBodySlides, "Config File")) // check distribution rules for whole config
             {
                 _logger.LogReport("Asset Pack " + ap.GroupName + " is invalid due to its main distribution rules.", false, npcInfo);
             }
@@ -645,7 +645,7 @@ public HashSet<FlattenedAssetPack> FilterValidConfigsForNPC(HashSet<FlattenedAss
                 for (int j = 0; j < candidatePack.Subgroups[i].Count; j++)
                 {
                     bool isSpecificNPCAssignment = forcedAssetPack != null && forcedAssignments[i].Any();
-                    if (!isSpecificNPCAssignment && !SubgroupValidForCurrentNPC(candidatePack.Subgroups[i][j], npcInfo, mode, assignedBodyGen, assignedBodySlides))
+                    if (!isSpecificNPCAssignment && !SubgroupValidForCurrentNPC(candidatePack.Subgroups[i][j], npcInfo, mode, assignedBodyGen, assignedBodySlides, "Subgroup"))
                     {
                         candidatePack.Subgroups[i].RemoveAt(j);
                         j--;
@@ -808,7 +808,7 @@ public HashSet<FlattenedAssetPack> FilterValidConfigsForNPC(HashSet<FlattenedAss
                                     {
                                         _logger.LogReport("The consistency subgroup " + consistencySubgroupIDs[i] + " was either filtered out or no longer exists within the config file. Choosing a different subgroup at this position.", true, npcInfo);
                                     }
-                                    else if (!SubgroupValidForCurrentNPC(consistencySubgroup, npcInfo, mode, assignedBodyGen, assignedBodySlides))
+                                    else if (!SubgroupValidForCurrentNPC(consistencySubgroup, npcInfo, mode, assignedBodyGen, assignedBodySlides, "Subgroup"))
                                     {
                                         _logger.LogReport("Consistency subgroup " + consistencySubgroup.Id + " (" + consistencySubgroup.Name + ") is no longer valid for this NPC. Choosing a different subgroup at this position", true, npcInfo);
                                         consistencyAssetPack.Subgroups[i].Remove(consistencySubgroup);
@@ -929,9 +929,9 @@ public bool RemoveInvalidLinkedSubgroups(FlattenedAssetPack assetPack, NPCInfo n
     /// <param name="npcInfo"></param>
     /// <param name="forceIfAttributeCount">The number of ForceIf attributes within this subgroup that were matched by the current NPC</param>
     /// <returns></returns>
-    private bool SubgroupValidForCurrentNPC(FlattenedSubgroup subgroup, NPCInfo npcInfo, AssetPackAssignmentMode mode, List<BodyGenConfig.BodyGenTemplate> assignedBodyGen, List<BodySlideSetting> assignedBodySlides)
+    private bool SubgroupValidForCurrentNPC(FlattenedSubgroup subgroup, NPCInfo npcInfo, AssetPackAssignmentMode mode, List<BodyGenConfig.BodyGenTemplate> assignedBodyGen, List<BodySlideSetting> assignedBodySlides, string reportStringType)
     {
-        var reportString = "Subgroup " + subgroup.GetDetailedID_NameString(false);
+        var reportString = reportStringType + " " + subgroup.GetDetailedID_NameString(false) + " ";
         if (npcInfo.SpecificNPCAssignment != null && npcInfo.SpecificNPCAssignment.SubgroupIDs.Contains(subgroup.Id))
         {
             _logger.LogReport(reportString + "is valid because it is specifically assigned by user.", false, npcInfo);
@@ -1004,7 +1004,7 @@ private bool SubgroupValidForCurrentNPC(FlattenedSubgroup subgroup, NPCInfo npcI
         // Distribution Enabled
         if (subgroup.ForceIfMatchCount == 0 && !subgroup.DistributionEnabled)
         {
-            _logger.LogReport(reportString + "is invalid because its distribution is disabled to random NPCs, it is not a Specific NPC Assignment, and the NPC does not match and of its ForceIf attributes.", false, npcInfo);
+            _logger.LogReport(reportString + "is invalid because its distribution is disabled to random NPCs, it is not a Specific NPC Assignment, and the NPC does not match any of its ForceIf attributes.", false, npcInfo);
             return false;
         }