Fixed ParameterAdd and added Begin with Rings tweak

modified: Sonic-06-Mod-Manager/Properties/AssemblyInfo.cs modified: Sonic-06-Mod-Manager/Properties/Settings.Designer.cs modified: Sonic-06-Mod-Manager/Properties/Settings.settings modified: Sonic-06-Mod-Manager/app.config modified: Sonic-06-Mod-Manager/src/Environment3/RushInterface.Designer.cs modified: Sonic-06-Mod-Manager/src/Environment3/RushInterface.cs modified: Sonic-06-Mod-Manager/src/Environment3/RushInterface.resx modified: Sonic-06-Mod-Manager/src/UnifyPatcher.cs modified: Sonic-06-Mod-Manager/src/UnifyProgram.cs
hyperbx · Mar 18, 2020 · 8306c24 · 8306c24
1 parent c9a15e2
commit 8306c24
Show file tree

Hide file tree

Showing 9 changed files with 145 additions and 22 deletions.
diff --git a/Sonic-06-Mod-Manager/Properties/AssemblyInfo.cs b/Sonic-06-Mod-Manager/Properties/AssemblyInfo.cs
@@ -12,4 +12,4 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("277111e3-79d8-41b5-b0d7-7609dff6e36f")]
 [assembly: AssemblyVersion("2.0.0.6")]
-[assembly: AssemblyFileVersion("3.1.3.0")]
+[assembly: AssemblyFileVersion("3.1.4.0")]
diff --git a/Sonic-06-Mod-Manager/Properties/Settings.Designer.cs b/Sonic-06-Mod-Manager/Properties/Settings.Designer.cs
diff --git a/Sonic-06-Mod-Manager/Properties/Settings.settings b/Sonic-06-Mod-Manager/Properties/Settings.settings
@@ -110,5 +110,8 @@
     <Setting Name="Emulator_Arguments" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="Tweak_BeginWithRings" Type="System.Decimal" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/Sonic-06-Mod-Manager/app.config b/Sonic-06-Mod-Manager/app.config
@@ -115,6 +115,9 @@
             <setting name="Emulator_Arguments" serializeAs="String">
                 <value />
             </setting>
+            <setting name="Tweak_BeginWithRings" serializeAs="String">
+                <value>0</value>
+            </setting>
         </Unify.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/Sonic-06-Mod-Manager/src/Environment3/RushInterface.Designer.cs b/Sonic-06-Mod-Manager/src/Environment3/RushInterface.Designer.cs
diff --git a/Sonic-06-Mod-Manager/src/Environment3/RushInterface.cs b/Sonic-06-Mod-Manager/src/Environment3/RushInterface.cs
@@ -203,6 +203,7 @@ private void LoadSettings()
                 NumericUpDown_CameraHeight.Value   = Properties.Settings.Default.Tweak_CameraHeight;
                 NumericUpDown_FieldOfView.Value    = Properties.Settings.Default.Tweak_FieldOfView;
                 NumericUpDown_AmyHammerRange.Value = Properties.Settings.Default.Tweak_AmyHammerRange;
+                NumericUpDown_BeginWithRings.Value = Properties.Settings.Default.Tweak_BeginWithRings;
                 #endregion
 
                 #region Restore check box states
@@ -1973,6 +1974,7 @@ private void NumericUpDown_Tweaks_ValueChanged(object sender, EventArgs e) {
             else if   (sender == NumericUpDown_CameraHeight) Properties.Settings.Default.Tweak_CameraHeight   = ((NumericUpDown)sender).Value;
             else if    (sender == NumericUpDown_FieldOfView) Properties.Settings.Default.Tweak_FieldOfView    = ((NumericUpDown)sender).Value;
             else if (sender == NumericUpDown_AmyHammerRange) Properties.Settings.Default.Tweak_AmyHammerRange = ((NumericUpDown)sender).Value;
+            else if (sender == NumericUpDown_BeginWithRings) Properties.Settings.Default.Tweak_BeginWithRings = ((NumericUpDown)sender).Value;
             Properties.Settings.Default.Save();
         }
 
@@ -1996,7 +1998,8 @@ private void Button_Tweaks_Default(object sender, EventArgs e) {
                 Properties.Settings.Default.Tweak_AntiAliasing = 1;
 
             // Reset Camera Type
-            else if (sender == Button_CameraType_Default) {
+            else if (sender == Button_CameraType_Default)
+            {
                 Properties.Settings.Default.Tweak_CameraType = 0;
                 Properties.Settings.Default.Tweak_CameraDistance = 650;
                 Properties.Settings.Default.Tweak_CameraHeight = 70;
@@ -2042,6 +2045,10 @@ private void Button_Tweaks_Default(object sender, EventArgs e) {
             else if (sender == Button_AmyHammerRange_Default)
                 Properties.Settings.Default.Tweak_AmyHammerRange = 50;
 
+            // Reset Begin with Rings
+            else if (sender == Button_BeginWithRings_Default)
+                Properties.Settings.Default.Tweak_BeginWithRings = 0;
+
             Properties.Settings.Default.Save();
         }
 

diff --git a/Sonic-06-Mod-Manager/src/Environment3/RushInterface.resx b/Sonic-06-Mod-Manager/src/Environment3/RushInterface.resx
@@ -163,6 +163,18 @@
         RcEjHncAXsjaFfCiZP9E6Aw3msfbxYOXjOxryG0URZZcr9eQsfqvBg0PXjJkIefuJY7HY679LdyDZpqB
         Q8ODlwxZhF5RFPavcYKWxIKuIoZzB+ElQ9a1p3xliO4mXJXnBazdyQAvGRtmZMN3vkFwN2kDmob5lDsa
         P42WpFyNq/KSeNOANZxeO70Kn4+IPcFcsBXUCtZwp2duxvN+AFwMV+KqpemtAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="Button_BeginWithRings_Default.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        xAAADsQBlSsOGwAAAX9JREFUOE+Fkk9qwkAUxtMDVLoptSfoCVwUunIREjyCSW8QvYogbixdFEIpWbjw
+        AOLWS0QaEjeudZHN9P3GN6loSh98OPP9m0mMdzwezT+483Rkfa/L38HU7/dbsd/vmwL57QgKwZfg1oYZ
+        2bSGwUXB23K5NIvFAm7TlFCAMcuyPwsE/m63M4PBwPJa8ukKgrIsTRiGVpzNZm0FL4fDoXBaEAQmz3O0
+        Zwrep9OpFUajkRHjVYEe1BWtTJLEapPJBO0DIY/j2JKr1QqytYCR9SsetOFwiFZAGt/3LVlVlS0gCLjN
+        RcEjHncAXsjaFfCiZP9E6Aw3msfbxYOXjOxryG0URZZcr9eQsfqvBg0PXjJkIefuJY7HY679LdyDZpqB
+        Q8ODlwxZhF5RFPavcYKWxIKuIoZzB+ElQ9a1p3xliO4mXJXnBazdyQAvGRtmZMN3vkFwN2kDmob5lDsa
+        P42WpFyNq/KSeNOANZxeO70Kn4+IPcFcsBXUCtZwp2duxvN+AFwMV+KqpemtAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="Button_AmyHammerRange_Default.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">