Access FadeAction Fadeout Type

anno-mods · Aug 19, 2024 · f64953d · f64953d
1 parent 6810f21
commit f64953d
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 7 deletions.
diff --git a/FeedbackEditor/Models/FC/Actions/FadeAction.cs b/FeedbackEditor/Models/FC/Actions/FadeAction.cs
@@ -13,7 +13,7 @@ namespace FeedbackEditor.Models.FC.Actions
     public class FadeAction : SequenceAction
     {
         public bool ShowObject { get; set; }
-        public int FadingMode { get; set; }
+        public int FadingMode { get; set; } = 2;
         public int TimeOffset { get; set; }
 
         public FadeAction()

diff --git a/FeedbackEditor/Models/FC/Actions/WalkBetweenDummiesAction.cs b/FeedbackEditor/Models/FC/Actions/WalkBetweenDummiesAction.cs
@@ -41,6 +41,6 @@ public int SequenceIDForSerializing
 
         public bool UseTargetDummyDirection { get; set; }
 
-        public String DummyGroup { get; set; } = "CDATA[-1 - 1 - 1]";
+        public String DummyGroup { get; set; } = "CDATA[-1 -1 -1]";
     }
 }
diff --git a/FeedbackEditor/Models/FC/FeedbackConfig.cs b/FeedbackEditor/Models/FC/FeedbackConfig.cs
@@ -27,11 +27,11 @@ public class FeedbackConfig
 
         public bool ApplyScaleToMovementSpeed { get; set; }
 
-        public int ActorCount { get; set; }
+        public int ActorCount { get; set; } = 1;
 
-        public int MaxActorCount { get; set; }
+        public int MaxActorCount { get; set; } = 1;
 
-        public int CreateChance { get; set; }
+        public int CreateChance { get; set; } = 100;
 
         public String BoneLink { get; set; } = "BoneLink";
 

diff --git a/FeedbackEditor/Views/LoopSettingsView.xaml b/FeedbackEditor/Views/LoopSettingsView.xaml
@@ -94,7 +94,8 @@
                       Grid.ColumnSpan="2"
                       HorizontalAlignment="Left"
                       Margin="5"
-                      Content="Reset to Default Loop"
+                      Content="Reset to Default on every Loop"
+                      ToolTip="If checked, the Actor will revert to it's default state when repeating this loop. If not, the new Loop starts from whatever State the Actor is currently in."
                       IsChecked="{Binding DisplayedLoop.Loop.DefaultState.ResetToDefaultEveryLoop, UpdateSourceTrigger=PropertyChanged}" />
 
             <Grid>

diff --git a/FeedbackEditor/Views/Nodes/FadeNodeView.xaml b/FeedbackEditor/Views/Nodes/FadeNodeView.xaml
@@ -30,6 +30,7 @@
                                     <Grid.RowDefinitions>
                                         <RowDefinition />
                                         <RowDefinition />
+                                        <RowDefinition />
                                     </Grid.RowDefinitions>
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="Auto"/>
@@ -58,6 +59,24 @@
                                                              Step="1"
                                                              Margin="5">
                                     </controls:NumericSpinner>
+
+                                    <Label Content="Fading Mode"
+                                           Grid.Row="2"
+                                           Margin="5"
+                                           Style="{StaticResource MaterialDesignLabel}">
+
+                                    </Label>
+                                    <controls:NumericSpinner Value="{Binding DataContext.ViewModel.Action.FadingMode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, ElementName=FadeView}"
+                                                             Grid.Row="2"
+                                                             Grid.Column="1"
+                                                             ValueChanged="NumericSpinner_ValueChanged"
+                                                             Decimals="0"
+                                                             MinValue="0"
+                                                             MaxValue="2"
+                                                             MinWidth="80"
+                                                             Step="1"
+                                                             Margin="5">
+                                    </controls:NumericSpinner>
                                 </Grid>
                             </DataTemplate>
                         </Setter.Value>

diff --git a/FeedbackEditor/Views/Nodes/WalkBetweenDummiesNodeView.xaml b/FeedbackEditor/Views/Nodes/WalkBetweenDummiesNodeView.xaml
@@ -50,7 +50,7 @@
                                                Margin="5"
                                                Style="{StaticResource MaterialDesignLabel}"
                                                VerticalAlignment="Center"/>
-                                        <controls:NumericSpinner Value="{Binding DataContext.ViewModel.Action.SpeedFactorF, UpdateSourceTrigger=PropertyChanged, ElementName=WalkBetweenDummiesView}"
+                                        <controls:NumericSpinner Value="{Binding DataContext.ViewModel.Action.SpeedFactorF, UpdateSourceTrigger=PropertyChanged, ElementName=WalkBetweenDummiesView, Mode=TwoWay}"
                                                                  Grid.Column="1"
                                                                  Decimals="2"
                                                                  Step="0.05"
@@ -111,6 +111,25 @@
                                         </TextBox>
                                     </Grid>
 
+                                    <CheckBox Style="{StaticResource MaterialDesignDataGridCheckBoxColumnEditingStyle}"
+                                              Grid.Row="1"
+                                              FontSize="12"
+                                              Grid.ColumnSpan="2"
+                                              HorizontalAlignment="Left"
+                                              Margin="5"
+                                              Background="{StaticResource WalkActionAccentColorBrush}"
+                                              Content="Walk from Current Position"
+                                              IsChecked="{Binding DataContext.ViewModel.Action.WalkFromCurrentPosition, UpdateSourceTrigger=PropertyChanged, ElementName=WalkBetweenDummiesView}" />
+                                    <CheckBox Style="{StaticResource MaterialDesignDataGridCheckBoxColumnEditingStyle}"
+                                              Grid.Row="1"
+                                              FontSize="12"
+                                              Grid.ColumnSpan="2"
+                                              HorizontalAlignment="Left"
+                                              Margin="5"
+                                              Background="{StaticResource WalkActionAccentColorBrush}"
+                                              Content="Use Target Dummy Direction"
+                                              IsChecked="{Binding DataContext.ViewModel.Action.UseTargetDummyDirection, UpdateSourceTrigger=PropertyChanged, ElementName=WalkBetweenDummiesView}" />
+