Update MainForm

alex193a · Jan 24, 2016 · 5abb4cd · 5abb4cd
1 parent 757adb3
commit 5abb4cd
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 24 deletions.
diff --git a/SOSSE/AnimalEditingForm.cs b/SOSSE/AnimalEditingForm.cs
@@ -110,22 +110,22 @@ public byte BirthdayMonth
             {
                 get
                 {
-                    return animalBytes[0x1A];
+                    return animalBytes[0x12];
                 }
                 set
                 {
-                    animalBytes[0x1A] = value;
+                    animalBytes[0x12] = value;
                 }
             }
             public byte BirthdayDay
             {
                 get
                 {
-                    return animalBytes[0x1B];
+                    return animalBytes[0x2C];
                 }
                 set
                 {
-                    animalBytes[0x1B] = value;
+                    animalBytes[0x2C] = value;
                 }
             }
             public bool IsTouched
@@ -708,10 +708,10 @@ public byte[] ToArray()
         }
         #endregion
 
-        private const int animalOffset = 0x1C508;
+        private const int animalOffset = 0x1CA64;
         private const int wildOffset = 0x1E818;
         private const int petOffset = 0x1EFB0;
-        private const int horseOffset = 0x1F2F8;
+        private const int horseOffset = 0x1F628;
         private Animal currentAnimal;
         private int currentAnimalSlot;
         private bool canEditAnimal;
@@ -809,10 +809,10 @@ private void displayAnimal()
         {
             DataLoaded = false;
 
-            byte[] animalBytes = new byte[140];
+            byte[] animalBytes = new byte[94];
             int slot = animalSlotComboBox.SelectedIndex;
-            Array.Copy(MainForm.SaveData, animalOffset + 140 * slot,
-                animalBytes, 0, 140);
+            Array.Copy(MainForm.SaveData, animalOffset + 94 * slot,
+                animalBytes, 0, 94);
             currentAnimal = new Animal(animalBytes);
 
             short animalType = currentAnimal.Type;
@@ -831,8 +831,8 @@ private void displayAnimal()
             collectCheckBox.Checked = currentAnimal.IsCollected;
             eatCheckBox.Checked = currentAnimal.IsAte;
             pregnantCheckBox.Checked = currentAnimal.IsPregnant;
-            personalityComboBox.SelectedIndex = (int)currentAnimal.Personality;
-            stateComboBox.SelectedIndex = (int)currentAnimal.State;
+            //personalityComboBox.SelectedIndex = (int)currentAnimal.Personality;
+            //stateComboBox.SelectedIndex = (int)currentAnimal.State;
             productNumericUpDown.Value = currentAnimal.ByProducts;
             pregnantNumericUpDown.Value = currentAnimal.PregnantDays;
             woolNumericUpDown.Value = currentAnimal.NextWool;
@@ -1166,6 +1166,7 @@ private void AnimalEditingForm_FormClosing(object sender, FormClosingEventArgs e
             saveCurrentWildAnimal();
             saveCurrentPet();
             saveHorse();
+
         }
     }
 }
diff --git a/SOSSE/MainForm.cs b/SOSSE/MainForm.cs
@@ -28,20 +28,20 @@ public MainForm()
         private void enableButtons()
         {
             saveAsButton.Enabled = true;
-            itemButton.Enabled = true;
-            objectButton.Enabled = true;
-            shipLogButton.Enabled = true;
+            itemButton.Enabled = false;
+            objectButton.Enabled = false;
+            shipLogButton.Enabled = false;
             balanceButton.Enabled = true;
-            blueprintButton.Enabled = true;
-            conquestButton.Enabled = true;
-            shopButton.Enabled = true;
-            animalButton.Enabled = true;
-            patternButton.Enabled = true;
-            recipeButton.Enabled = true;
-            vendorButton.Enabled = true;
-            npcButton.Enabled = true;
+            blueprintButton.Enabled = false;
+            conquestButton.Enabled = false;
+            shopButton.Enabled = false;
+            animalButton.Enabled = false;
+            patternButton.Enabled = false;
+            recipeButton.Enabled = false;
+            vendorButton.Enabled = false;
+            npcButton.Enabled = false;
             generalButton.Enabled = true;
-            eventButton.Enabled = true;
+            eventButton.Enabled = false;
         }
 
         private void closeAllHiddenForm()

diff --git a/SOSSE/Properties/AssemblyInfo.cs b/SOSSE/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.1")]
+[assembly: AssemblyVersion("1.7.2")]
 [assembly: AssemblyFileVersion("1.0.0.0")]