Final multi-CoC push.

General changes: - Save As now shows the correct number of save slots depending on the game (CoC vs. CoC-Revamp-Mod). - Added missing Bee cock. CoC-Revamp-Mod changes: - Added support for beards. - Added missing body part types.
tmedwards · Jul 15, 2015 · abbad65 · abbad65
1 parent 27fe02c
commit abbad65
Show file tree

Hide file tree

Showing 12 changed files with 103 additions and 27 deletions.
diff --git a/CoCEd/CoCEd.Data.xml b/CoCEd/CoCEd.Data.xml
@@ -354,6 +354,7 @@
       <CockType ID="9"  Name="Dragon"/>
       <CockType ID="10" Name="C&#x0153;url"/>
       <CockType ID="11" Name="Fox"/>
+      <CockType ID="12" Name="Bee"/>
     </CockTypes>
     <!-- ========================================================================================================================================== -->
     <CockSockTypes>

diff --git a/CoCEd/CoCEd.DataRevampMod.xml b/CoCEd/CoCEd.DataRevampMod.xml
@@ -175,6 +175,13 @@
       <HairColor>rubbery white</HairColor>
     </HairColors>
     <!-- ========================================================================================================================================== -->
+    <BeardTypes>
+      <BeardType ID="0" Name="Normal"/>
+      <BeardType ID="1" Name="Goatee"/>
+      <BeardType ID="2" Name="Cleancut"/>
+      <BeardType ID="3" Name="Mountain-man"/>
+    </BeardTypes>
+    <!-- ========================================================================================================================================== -->
     <FaceTypes>
       <FaceType ID="0"  Name="Human"/>
       <FaceType ID="1"  Name="Horse"/>
@@ -195,6 +202,8 @@
       <FaceType ID="16" Name="Mouse"/>
       <FaceType ID="17" Name="Ferret Mask"/>
       <FaceType ID="18" Name="Ferret Face"/>
+      <FaceType ID="19" Name="Pig"/>
+      <FaceType ID="20" Name="Boar"/>
     </FaceTypes>
     <!-- ========================================================================================================================================== -->
     <TongueTypes>
@@ -225,6 +234,7 @@
       <EarType ID="11" Name="Raccoon"/>
       <EarType ID="12" Name="Mouse"/>
       <EarType ID="13" Name="Ferret"/>
+      <EarType ID="14" Name="Pig"/>
     </EarTypes>
     <!-- ========================================================================================================================================== -->
     <HornTypes>
@@ -266,6 +276,9 @@
       <TailType ID="15" Name="Raccoon"/>
       <TailType ID="16" Name="Mouse"/>
       <TailType ID="17" Name="Ferret"/>
+      <TailType ID="18" Name="Behemoth"/>
+      <TailType ID="19" Name="Pig"/>
+      <TailType ID="20" Name="Scorpion"/>
     </TailTypes>
     <!-- ========================================================================================================================================== -->
     <WingTypes>
@@ -315,6 +328,7 @@
       <LowerBodyType ID="18" Name="Dragon"/>
       <LowerBodyType ID="19" Name="Raccoon"/>
       <LowerBodyType ID="20" Name="Ferret"/>
+      <LowerBodyType ID="21" Name="Pig"/>
     </LowerBodyTypes>
     <!-- ========================================================================================================================================== -->
     <PiercingTypes>
@@ -354,6 +368,9 @@
       <CockType ID="9"  Name="Dragon"/>
       <CockType ID="10" Name="C&#x0153;url"/>
       <CockType ID="11" Name="Fox"/>
+      <CockType ID="12" Name="Bee"/>
+      <CockType ID="13" Name="Pig"/>
+      <CockType ID="14" Name="Avian"/>
     </CockTypes>
     <!-- ========================================================================================================================================== -->
     <CockSockTypes>
@@ -373,6 +390,7 @@
     <!-- ========================================================================================================================================== -->
     <VaginaTypes>
       <VaginaType ID="0" Name="Human"/>
+      <VaginaType ID="1" Name="Horse"/>
       <VaginaType ID="5" Name="Black (Sand Trap)"/>
     </VaginaTypes>
     <!-- ========================================================================================================================================== -->

diff --git a/CoCEd/MainWindow.xaml b/CoCEd/MainWindow.xaml
@@ -63,13 +63,13 @@
             <TabItem Header="Items">
                 <view:ItemsPage Background="White"/>
             </TabItem>
-            <TabItem Header="Key items">
+            <TabItem Header="Key Items">
                 <view:KeyItemsPage Background="White"/>
             </TabItem>
             <TabItem Header="Perks">
                 <view:PerkPage Background="White"/>
             </TabItem>
-            <TabItem Header="Raw data" BorderThickness="0">
+            <TabItem Header="Raw Data" BorderThickness="0">
                 <view:RawPage Background="White"/>
             </TabItem>
         </TabControl>

diff --git a/CoCEd/Model/FileManager.cs b/CoCEd/Model/FileManager.cs
@@ -37,10 +37,17 @@ public static class FileManager
         static readonly List<string> _externalPaths = new List<string>();
         static readonly List<FlashDirectory> _directories = new List<FlashDirectory>();
 
-
         const int MaxBackupFiles = 10;
+
+        const int MaxSaveSlotsCoC = 9;
+        const int MaxSaveSlotsRevampMod = 14;
         public const int SaveSlotsLowerBound = 1;
-        public const int SaveSlotsUpperBound = 14;
+        public const int SaveSlotsUpperBound = MaxSaveSlotsRevampMod; // must use largest value here
+
+        public static int SaveSlotsUpperBoundByGame
+        {
+            get { return VM.Instance.IsRevampMod ? MaxSaveSlotsRevampMod : MaxSaveSlotsCoC; }
+        }
 
         public static string PathWithMissingPermissions { get; private set; }
 

diff --git a/CoCEd/Model/XmlData.cs b/CoCEd/Model/XmlData.cs
@@ -103,6 +103,8 @@ public sealed class XmlBodySet
         public XmlEnum[] HairTypes { get; set; }
         [XmlArray, XmlArrayItem("HairColor")]
         public String[] HairColors { get; set; }
+        [XmlArray, XmlArrayItem("BeardType")]
+        public XmlEnum[] BeardTypes { get; set; }
         [XmlArray, XmlArrayItem("SkinTone")]
         public String[] SkinTones { get; set; }
         [XmlArray, XmlArrayItem("SkinAdjective")]

diff --git a/CoCEd/View/GeneralPage.xaml b/CoCEd/View/GeneralPage.xaml
@@ -126,43 +126,51 @@
                     <ComboBox Text="{Binding Game.HairColor}" ItemsSource="{Binding Data.Body.HairColors}" Style="{StaticResource EditableTextBox}"/>
 
                     <TextBlock              Text="Hair type"/>
-                    <common:MyComboBox SelectedValue="{Binding Game.HairType}" ItemsSource="{Binding Data.Body.HairTypes}"/>
+                    <common:MyComboBox      SelectedValue="{Binding Game.HairType}" ItemsSource="{Binding Data.Body.HairTypes}"/>
+                </common:AutoGrid>
+                <common:AutoGrid IsEnabled="{Binding Game.IsRevampMod}" Visibility="{Binding Game.RevampModVisibility, FallbackValue={x:Static Visibility.Collapsed}}">
+                    <TextBlock              Text="Beard length&#x202F;*" ToolTip="Enable with any value greater than 0."/>
+                    <common:MyNumericBox    Value="{Binding Game.BeardLength}" Type="Double" Unit="inches"/>
 
+                    <TextBlock              Text="Beard style"/>
+                    <common:MyComboBox      SelectedValue="{Binding Game.BeardType}" ItemsSource="{Binding Data.Body.BeardTypes}"/>
+                </common:AutoGrid>
+                <common:AutoGrid>
                     <TextBlock              Text="Face"/>
-                    <common:MyComboBox SelectedValue="{Binding Game.FaceType}" ItemsSource="{Binding Data.Body.FaceTypes}"/>
+                    <common:MyComboBox      SelectedValue="{Binding Game.FaceType}" ItemsSource="{Binding Data.Body.FaceTypes}"/>
 
                     <TextBlock              Text="Tongue"/>
-                    <common:MyComboBox SelectedValue="{Binding Game.TongueType}" ItemsSource="{Binding Data.Body.TongueTypes}"/>
+                    <common:MyComboBox      SelectedValue="{Binding Game.TongueType}" ItemsSource="{Binding Data.Body.TongueTypes}"/>
 
                     <TextBlock              Text="Eyes"/>
-                    <common:MyComboBox SelectedValue="{Binding Game.EyeType}" ItemsSource="{Binding Data.Body.EyeTypes}"/>
+                    <common:MyComboBox      SelectedValue="{Binding Game.EyeType}" ItemsSource="{Binding Data.Body.EyeTypes}"/>
 
                     <TextBlock              Text="Ears"/>
-                    <common:MyComboBox SelectedValue="{Binding Game.EarType}" ItemsSource="{Binding Data.Body.EarTypes}"/>
+                    <common:MyComboBox      SelectedValue="{Binding Game.EarType}" ItemsSource="{Binding Data.Body.EarTypes}"/>
 
                     <TextBlock              Text="Antennae"/>
-                    <common:MyComboBox SelectedValue="{Binding Game.AntennaeType}" ItemsSource="{Binding Data.Body.AntennaeTypes}"/>
+                    <common:MyComboBox      SelectedValue="{Binding Game.AntennaeType}" ItemsSource="{Binding Data.Body.AntennaeTypes}"/>
 
                     <TextBlock              Text="Horns"/>
-                    <common:MyComboBox SelectedValue="{Binding Game.HornType}" ItemsSource="{Binding Data.Body.HornTypes}"/>
+                    <common:MyComboBox      SelectedValue="{Binding Game.HornType}" ItemsSource="{Binding Data.Body.HornTypes}"/>
 
                     <TextBlock              Text="{Binding Game.HornsValueLabel}" IsEnabled="{Binding Game.HornsValueEnabled}"/>
                     <common:MyNumericBox    Value="{Binding Game.HornsValue}" Unit="{Binding Game.HornsValueUnit}" IsEnabled="{Binding Game.HornsValueEnabled}"/>
 
                     <TextBlock              Text="Eyebrow piercing"/>
-                    <common:MyPiercingBox DataContext="{Binding Game.EyebrowPiercing}"/>
+                    <common:MyPiercingBox   DataContext="{Binding Game.EyebrowPiercing}"/>
 
                     <TextBlock              Text="Ears piercing"/>
-                    <common:MyPiercingBox DataContext="{Binding Game.EarsPiercing}"/>
+                    <common:MyPiercingBox   DataContext="{Binding Game.EarsPiercing}"/>
 
                     <TextBlock              Text="Nose piercing"/>
-                    <common:MyPiercingBox DataContext="{Binding Game.NosePiercing}"/>
+                    <common:MyPiercingBox   DataContext="{Binding Game.NosePiercing}"/>
 
                     <TextBlock              Text="Lip piercing"/>
-                    <common:MyPiercingBox DataContext="{Binding Game.LipPiercing}"/>
+                    <common:MyPiercingBox   DataContext="{Binding Game.LipPiercing}"/>
 
                     <TextBlock              Text="Tongue piercing"/>
-                    <common:MyPiercingBox DataContext="{Binding Game.TonguePiercing}"/>
+                    <common:MyPiercingBox   DataContext="{Binding Game.TonguePiercing}"/>
                 </common:AutoGrid>
             </StackPanel>
         </Grid>

diff --git a/CoCEd/View/MiscPage.xaml b/CoCEd/View/MiscPage.xaml
@@ -102,9 +102,6 @@
                     <TextBlock              Text="Pregnancy&#x202F;*" ToolTip="A &#x25CA; denotes special pregnancies.  Do not set these manually."/>
                     <common:MyComboBox      SelectedValue="{Binding Game.PregnancyType}" ItemsSource="{Binding Data.Body.PregnancyTypes}"/>
 
-                    <TextBlock              Text="Pregnancy&#x202F;*" ToolTip="A &#x25CA; denotes special pregnancies.  Do not set these manually."/>
-                    <ComboBox               ItemsSource="{Binding Data.Body.PregnancyTypes}"/>
-
                     <TextBlock              Text="Remaining&#x202F;*" IsEnabled="{Binding Game.IsPregnancyEnabled}" ToolTip="A virgin vagina will put pregnancy on hold. With the diapause perk it will only progress when you absorb fluids."/>
                     <common:MyNumericBox    Value="{Binding Game.PregnancyTime}" Unit="hours" IsEnabled="{Binding Game.IsPregnancyEnabled}"/>
 

diff --git a/CoCEd/View/TopBar.xaml b/CoCEd/View/TopBar.xaml
@@ -87,7 +87,7 @@
                 </ToggleButton.ContextMenu>
             </ToggleButton>
 
-            <ToggleButton x:Name="saveButton" Margin="5,1,0,0" Content="Save as" BorderThickness="0" FontSize="12" Checked="saveButton_StateChanged" Unchecked="saveButton_StateChanged" HorizontalContentAlignment="Left" VerticalAlignment="Top" Background="Transparent" IsEnabled="{Binding HasData}">
+            <ToggleButton x:Name="saveButton" Margin="5,1,0,0" Content="Save As" BorderThickness="0" FontSize="12" Checked="saveButton_StateChanged" Unchecked="saveButton_StateChanged" HorizontalContentAlignment="Left" VerticalAlignment="Top" Background="Transparent" IsEnabled="{Binding HasData}">
                 <ToggleButton.ContextMenu>
                     <ContextMenu x:Name="saveMenu" Closed="saveMenu_Closed" Placement="Bottom" MinWidth="150"/>
                 </ToggleButton.ContextMenu>

diff --git a/CoCEd/View/TopBar.xaml.cs b/CoCEd/View/TopBar.xaml.cs
@@ -49,8 +49,6 @@ public TopBar()
         private void checkForUpdates_Click(object sender, RoutedEventArgs e)
         {
             (new CheckForUpdateBox()).ShowDialog();
-            //var box = new CheckForUpdateBox();
-            //box.ShowDialog();
         }
 
         void OnSaveRequiredChanged(object sender, bool saveRequired)

diff --git a/CoCEd/ViewModel/FilesVM.cs b/CoCEd/ViewModel/FilesVM.cs
@@ -161,15 +161,15 @@ public IEnumerable<IMenuItemVM> Children
                 if (_directory.Kind == DirectoryKind.Backup)
                 {
                     foreach (var file in _directory.Files) yield return new FileVM(file, _directory.Kind, false);
-                    yield return new OpenDirectoryItemVM(_directory.Path);  // Open directory
+                    yield return new OpenDirectoryItemVM(_directory.Path); // Open directory
                     yield break;
                 }
 
                 // Path not found?
                 if (String.IsNullOrEmpty(_directory.Path)) yield break;
 
                 // Return either a SaveTargetVM or a FileVM for every slot
-                for (int i = FileManager.SaveSlotsLowerBound; i <= FileManager.SaveSlotsUpperBound; i++)
+                for (int i = FileManager.SaveSlotsLowerBound; i <= FileManager.SaveSlotsUpperBoundByGame; i++)
                 {
                     var name = "CoC_" + i + ".sol";
                     var file = _directory.Files.FirstOrDefault(x => x.FilePath.EndsWith(name, StringComparison.InvariantCultureIgnoreCase));

diff --git a/CoCEd/ViewModel/GameVM.cs b/CoCEd/ViewModel/GameVM.cs
@@ -15,8 +15,12 @@ namespace CoCEd.ViewModel
     // TeaseLevel / XP
     public sealed partial class GameVM : ObjectVM
     {
-        //public readonly bool IsRevampMod = false;
+        public bool IsCoC { get { return !IsRevampMod; } }
         public bool IsRevampMod { get; private set; }
+        public Visibility CoCVisibility
+        {
+            get { return IsCoC ? Visibility.Visible : Visibility.Collapsed; }
+        }
         public Visibility RevampModVisibility
         {
             get { return IsRevampMod ? Visibility.Visible : Visibility.Collapsed; }
@@ -1358,16 +1362,52 @@ public string HungerTip
             }
         }
 
+        public int BeardType
+        {
+            get { return GetInt("beardStyle"); }
+            set
+            {
+                if (IsRevampMod)
+                {
+                    SetValue("beardStyle", value);
+                }
+            }
+        }
+
+        public double BeardLength
+        {
+            get { return GetDouble("beardLength"); }
+            set
+            {
+                if (IsRevampMod)
+                {
+                    SetValue("beardLength", value);
+                }
+            }
+        }
+
         public int ExploredGlacialRift
         {
             get { return GetFlag(2059).AsInt(); }
-            set { GetFlag(2059).SetValue(value); }
+            set
+            {
+                if (IsRevampMod)
+                {
+                    GetFlag(2059).SetValue(value);
+                }
+            }
         }
 
         public int ExploredVolcanicCrag
         {
             get { return GetFlag(2060).AsInt(); }
-            set { GetFlag(2060).SetValue(value); }
+            set
+            {
+                if (IsRevampMod)
+                {
+                    GetFlag(2060).SetValue(value);
+                }
+            }
         }
 
         #endregion

diff --git a/CoCEd/ViewModel/VM.cs b/CoCEd/ViewModel/VM.cs
@@ -56,6 +56,11 @@ public bool HasData
             get { return _currentFile != null; }
         }
 
+        public bool IsCoC
+        {
+            get { return !IsRevampMod; }
+        }
+
         public bool IsRevampMod
         {
             get { return _currentFile != null && _currentFile.Contains("hunger"); }