Version 1.5.0 release

Fusion86 · May 19, 2021 · a7e76f8 · a7e76f8
1 parent 22ee0e7
commit a7e76f8
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 24 deletions.
diff --git a/src/MHWAppearanceEditor/MHWAppearanceEditor.csproj b/src/MHWAppearanceEditor/MHWAppearanceEditor.csproj
@@ -18,12 +18,12 @@
         <AvaloniaResource Include="Assets\*" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="0.10.2" />
-        <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.2" />
-        <PackageReference Include="Avalonia.Desktop" Version="0.10.2" />
-        <PackageReference Include="Avalonia.Diagnostics" Version="0.10.2" />
-        <PackageReference Include="Avalonia.Direct2D1" Version="0.10.2" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.2" />
+        <PackageReference Include="Avalonia" Version="0.10.5" />
+        <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.5" />
+        <PackageReference Include="Avalonia.Desktop" Version="0.10.5" />
+        <PackageReference Include="Avalonia.Diagnostics" Version="0.10.5" />
+        <PackageReference Include="Avalonia.Direct2D1" Version="0.10.5" />
+        <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.5" />
         <PackageReference Include="Gameloop.Vdf" Version="0.6.1" />
         <PackageReference Include="Gameloop.Vdf.JsonConverter" Version="0.2.1" />
         <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />

diff --git a/src/MHWAppearanceEditor/SuperSecret.cs b/src/MHWAppearanceEditor/SuperSecret.cs
@@ -2,6 +2,6 @@
 {
     public static class SuperSecret
     {
-        public const string STEAM_WEB_API_KEY = "191019BF2EF1CC50238C9C88369E1A91";
+        public const string STEAM_WEB_API_KEY = "";
     }
 }
diff --git a/src/MHWAppearanceEditor/ViewModels/Tabs/SaveSlotViewModel.cs b/src/MHWAppearanceEditor/ViewModels/Tabs/SaveSlotViewModel.cs
@@ -216,8 +216,19 @@ public double Makeup3Luminescent
         public SDColor PalicoLeftEyeColor { get => SaveSlot.PalicoAppearance.LeftEyeColor; set => SaveSlot.PalicoAppearance.LeftEyeColor = value; }
         public SDColor PalicoRightEyeColor { get => SaveSlot.PalicoAppearance.RightEyeColor; set => SaveSlot.PalicoAppearance.RightEyeColor = value; }
         public SDColor PalicoClothingColor { get => SaveSlot.PalicoAppearance.ClothingColor; set => SaveSlot.PalicoAppearance.ClothingColor = value; }
-        public float PalicoFurLength { get => SaveSlot.PalicoAppearance.FurLength; set => SaveSlot.PalicoAppearance.FurLength = value; }
-        public float PalicoFurThickness { get => SaveSlot.PalicoAppearance.FurThickness; set => SaveSlot.PalicoAppearance.FurThickness = value; }
+
+        public double PalicoFurLength
+        {
+            get => Math.Round(Utility.Remap(0.1, 0.7, 0, 100, SaveSlot.PalicoAppearance.FurLength), 2);
+            set => SaveSlot.PalicoAppearance.FurLength = (float)(Utility.Remap(0, 100, 0.1, 0.7, value));
+        }
+
+        public double PalicoFurThickness
+        {
+            get => Math.Round(Utility.Remap(7, 3, 0, 100, SaveSlot.PalicoAppearance.FurThickness), 2);
+            set => SaveSlot.PalicoAppearance.FurThickness = (float)(Utility.Remap(0, 100, 7, 3, value));
+        }
+
         public PalicoVoiceType PalicoVoiceType { get => SaveSlot.PalicoAppearance.VoiceType; set => SaveSlot.PalicoAppearance.VoiceType = value; }
         public PalicoVoicePitch PalicoVoicePitch { get => SaveSlot.PalicoAppearance.VoicePitch; set => SaveSlot.PalicoAppearance.VoicePitch = value; }
 
@@ -342,7 +353,7 @@ public CharacterAssetViewModel PalicoTailType
         public List<Gender> Genders { get; } = new List<Gender>() { Gender.Male, Gender.Female };
         public List<EyelashLength> EyelashLengths { get; } = new List<EyelashLength>() { EyelashLength.Short, EyelashLength.Average, EyelashLength.Long };
         public List<PalicoVoiceType> PalicoVoiceTypes { get; } = new List<PalicoVoiceType>() { PalicoVoiceType.Type1, PalicoVoiceType.Type2, PalicoVoiceType.Type3 };
-        public List<PalicoVoicePitch> PalicoVoicePitches { get; } = new List<PalicoVoicePitch>() { PalicoVoicePitch.MediumPitch, PalicoVoicePitch.LowPitch, PalicoVoicePitch.HighPitch };
+        public List<PalicoVoicePitch> PalicoVoicePitches { get; } = new List<PalicoVoicePitch>() { PalicoVoicePitch.Medium, PalicoVoicePitch.Low, PalicoVoicePitch.High };
 
         [Reactive] public List<CharacterAssetViewModel> BrowTypes { get; private set; }
         [Reactive] public List<CharacterAssetViewModel> FaceTypes { get; private set; }

diff --git a/src/MHWAppearanceEditor/Views/SaveSlotEditors/SaveSlotMakeupView.xaml b/src/MHWAppearanceEditor/Views/SaveSlotEditors/SaveSlotMakeupView.xaml
@@ -17,7 +17,6 @@
                 <Setter Property="Minimum" Value="0"/>
                 <Setter Property="Maximum" Value="100"/>
                 <Setter Property="ParsingNumberStyle" Value="Float"/>
-                <Setter Property="Increment" Value="0.1"/>
                 <Setter Property="FormatString" Value="0.00"/>
             </Style>
         </WrapPanel.Styles>

diff --git a/src/MHWAppearanceEditor/Views/SaveSlotEditors/SaveSlotPalicoView.xaml b/src/MHWAppearanceEditor/Views/SaveSlotEditors/SaveSlotPalicoView.xaml
@@ -10,7 +10,7 @@
         <Grid Grid.Row="0"
               HorizontalAlignment="Center"
               RowDefinitions="Auto,5,Auto,5,Auto,5,Auto,5,Auto,5,Auto,5,Auto"
-              ColumnDefinitions="Auto,10,Auto,20,Auto,10,Auto">
+              ColumnDefinitions="Auto,10,140,20,Auto,10,Auto">
 
             <Grid.Styles>
                 <Style Selector="TextBlock">
@@ -20,25 +20,23 @@
 
                 <Style Selector="NumericUpDown">
                     <Setter Property="Minimum" Value="0"/>
-                    <Setter Property="Maximum" Value="1"/>
-                    <Setter Property="Width" Value="140"/>
+                    <Setter Property="Maximum" Value="100"/>
                     <Setter Property="ParsingNumberStyle" Value="Float"/>
-                    <Setter Property="Increment" Value="0.1"/>
-                    <Setter Property="FormatString" Value="0.0000"/>
+                    <Setter Property="FormatString" Value="0.00"/>
                 </Style>
             </Grid.Styles>
 
             <TextBlock Grid.Column="0" Grid.Row="0" Text="Pattern Color 1 Color"/>
-            <controls:ColorEdit Name="PatternColor1Edit" Grid.Column="2" Grid.Row="0" Width="140"/>
+            <controls:ColorEdit Name="PatternColor1Edit" Grid.Column="2" Grid.Row="0"/>
 
             <TextBlock Grid.Column="0" Grid.Row="2" Text="Pattern Color 2 Color"/>
-            <controls:ColorEdit Name="PatternColor2Edit" Grid.Column="2" Grid.Row="2" Width="140"/>
+            <controls:ColorEdit Name="PatternColor2Edit" Grid.Column="2" Grid.Row="2"/>
 
             <TextBlock Grid.Column="0" Grid.Row="4" Text="Pattern Color 3 Color"/>
-            <controls:ColorEdit Name="PatternColor3Edit" Grid.Column="2" Grid.Row="4" Width="140"/>
+            <controls:ColorEdit Name="PatternColor3Edit" Grid.Column="2" Grid.Row="4"/>
 
             <TextBlock Grid.Column="0" Grid.Row="6" Text="Fur Color"/>
-            <controls:ColorEdit Name="FurColorEdit" Grid.Column="2" Grid.Row="6" Width="140"/>
+            <controls:ColorEdit Name="FurColorEdit" Grid.Column="2" Grid.Row="6"/>
 
             <TextBlock Grid.Column="0" Grid.Row="8" Text="Left Eye Color"/>
             <controls:ColorEdit Name="LeftEyeColorEdit" Grid.Column="2" Grid.Row="8"/>
@@ -50,16 +48,24 @@
             <controls:ColorEdit Name="ClothingColorEdit" Grid.Column="6" Grid.Row="0" Width="140" HorizontalAlignment="Left"/>
 
             <TextBlock Grid.Column="4" Grid.Row="2" Text="Fur Length"/>
-            <NumericUpDown Grid.Column="6" Grid.Row="2" Value="{Binding PalicoFurLength}" HorizontalAlignment="Left"/>
+            <NumericUpDown Grid.Column="6" Grid.Row="2" Value="{Binding PalicoFurLength}" Width="140" HorizontalAlignment="Left"/>
 
             <TextBlock Grid.Column="4" Grid.Row="4" Text="Fur Thickness"/>
-            <NumericUpDown Grid.Column="6" Grid.Row="4" Value="{Binding PalicoFurThickness}" HorizontalAlignment="Left"/>
+            <NumericUpDown Grid.Column="6" Grid.Row="4" Value="{Binding PalicoFurThickness}" Width="140" HorizontalAlignment="Left"/>
 
             <TextBlock Grid.Column="4" Grid.Row="6" Text="Voice Type" VerticalAlignment="Center" TextAlignment="Right"/>
-            <ListBox Grid.Column="6" Grid.Row="6" Classes="FusionListBox" Items="{Binding PalicoVoiceTypes}" SelectedItem="{Binding PalicoVoiceType}"/>
+            <ListBox Grid.Column="6"
+                     Grid.Row="6"
+                     Classes="FusionListBox"
+                     Items="{Binding PalicoVoiceTypes}"
+                     SelectedItem="{Binding PalicoVoiceType}"/>
 
             <TextBlock Grid.Column="4" Grid.Row="8" Text="Voice Pitch" VerticalAlignment="Center" TextAlignment="Right"/>
-            <ListBox Grid.Column="6" Grid.Row="8" Classes="FusionListBox" Items="{Binding PalicoVoicePitches}" SelectedItem="{Binding PalicoVoicePitch}"/>
+            <ListBox Grid.Column="6"
+                     Grid.Row="8"
+                     Classes="FusionListBox"
+                     Items="{Binding PalicoVoicePitches}"
+                     SelectedItem="{Binding PalicoVoicePitch}"/>
         </Grid>
 
         <WrapPanel Grid.Row="2" HorizontalAlignment="Center">