Skip to content

Commit 1f984fe

Browse files
hyperbxhyperbx
committed
Removed Tails' Flight Limit tweak for the patch
1 parent c554681 commit 1f984fe

8 files changed

Lines changed: 30 additions & 112 deletions

File tree

‎Sonic-06-Mod-Manager/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
[assembly: ComVisible(false)]
1313
[assembly: Guid("277111e3-79d8-41b5-b0d7-7609dff6e36f")]
1414
[assembly: AssemblyVersion("2.0.0.6")]
15-
[assembly: AssemblyFileVersion("3.3.2.0")]
15+
[assembly: AssemblyFileVersion("3.3.3.0")]

‎Sonic-06-Mod-Manager/Properties/Settings.Designer.cs‎

Lines changed: 1 addition & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Sonic-06-Mod-Manager/Properties/Settings.settings‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,6 @@
9898
<Setting Name="Tweak_AmyHammerRange" Type="System.Decimal" Scope="User">
9999
<Value Profile="(Default)">50.0</Value>
100100
</Setting>
101-
<Setting Name="Tweak_TailsFlightLimit" Type="System.Boolean" Scope="User">
102-
<Value Profile="(Default)">False</Value>
103-
</Setting>
104101
<Setting Name="General_AutoUninstall" Type="System.Boolean" Scope="User">
105102
<Value Profile="(Default)">True</Value>
106103
</Setting>

‎Sonic-06-Mod-Manager/app.config‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,6 @@
103103
<setting name="Tweak_AmyHammerRange" serializeAs="String">
104104
<value>50.0</value>
105105
</setting>
106-
<setting name="Tweak_TailsFlightLimit" serializeAs="String">
107-
<value>False</value>
108-
</setting>
109106
<setting name="General_AutoUninstall" serializeAs="String">
110107
<value>True</value>
111108
</setting>

‎Sonic-06-Mod-Manager/src/Environment3/RushInterface.Designer.cs‎

Lines changed: 4 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Sonic-06-Mod-Manager/src/Environment3/RushInterface.cs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@ private void LoadSettings()
217217
CheckBox_Xenia_Fullscreen.Checked = Properties.Settings.Default.Emulator_Fullscreen;
218218
CheckBox_Xenia_DiscordRPC.Checked = Properties.Settings.Default.Emulator_DiscordRPC;
219219
CheckBox_ForceMSAA.Checked = Properties.Settings.Default.Tweak_ForceMSAA;
220-
CheckBox_TailsFlightLimit.Checked = Properties.Settings.Default.Tweak_TailsFlightLimit;
221220
CheckBox_UninstallOnLaunch.Checked = Properties.Settings.Default.General_AutoUninstall;
222221
CheckBox_AllowModStacking.Checked = Properties.Settings.Default.Debug_AllowModStacking;
223222

@@ -1985,7 +1984,6 @@ private void Button_Tweaks_Default(object sender, EventArgs e) {
19851984
/// </summary>
19861985
private void CheckBox_Tweaks_CheckedChanged(object sender, EventArgs e) {
19871986
if (sender == CheckBox_ForceMSAA) Properties.Settings.Default.Tweak_ForceMSAA = ((CheckBox)sender).Checked;
1988-
else if (sender == CheckBox_TailsFlightLimit) Properties.Settings.Default.Tweak_TailsFlightLimit = ((CheckBox)sender).Checked;
19891987
Properties.Settings.Default.Save();
19901988
}
19911989

@@ -2209,19 +2207,22 @@ private void InstallThread(bool mods, bool patches)
22092207
{
22102208
if (Paths.CheckFileLegitimacy(Properties.Settings.Default.Path_GameExecutable))
22112209
{
2212-
if (!File.Exists($"{Path.GetDirectoryName(Properties.Settings.Default.Path_GameExecutable)}\\xenon\\sound\\voice\\j\\wvo01_w00_tl.xma") && !File.Exists($"{Path.GetDirectoryName(Properties.Settings.Default.Path_GameExecutable)}\\ps3\\sound\\voice\\j\\wvo01_w00_tl.at3"))
2210+
string cmnPath = @"sound\voice\j\wvo01_w00_tl";
2211+
2212+
if (!File.Exists($"{Path.GetDirectoryName(Properties.Settings.Default.Path_GameExecutable)}\\xenon\\{cmnPath}.xma") && !File.Exists($"{Path.GetDirectoryName(Properties.Settings.Default.Path_GameExecutable)}\\ps3\\{cmnPath}.at3"))
22132213
{
22142214
DialogResult confirmation = UnifyMessenger.UnifyMessage.ShowDialog("This copy of the game does not appear to be a complete extraction! " +
2215-
"This may cause issues with mod and patch installation." +
2216-
"\n\nPlease refer to the Mod Manager Wiki's First Time Setup page for information." +
2217-
"\nDo you wish to try and continue?",
2218-
"Incomplete Dump", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);
2215+
"This may cause issues with mod and patch installation." +
2216+
"\n\nPlease refer to the Mod Manager Wiki's First Time Setup page for information." +
2217+
"\nDo you wish to try and continue?",
2218+
"Incomplete Dump", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);
22192219

22202220
if (confirmation == DialogResult.No)
22212221
{
22222222
return;
22232223
}
22242224
}
2225+
22252226
ModEngine.skipped.Clear(); // Clear the skipped list
22262227
SaveChecks(); // Save checked items
22272228
RefreshLists();

‎Sonic-06-Mod-Manager/src/Environment3/RushInterface.resx‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -123,19 +123,10 @@
123123
<metadata name="ToolTip_Information.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
124124
<value>444, 17</value>
125125
</metadata>
126+
<metadata name="ToolTip_Information.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
127+
<value>444, 17</value>
128+
</metadata>
126129
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
127-
<data name="SectionButton_RefreshMods.SectionImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
128-
<value>
129-
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
130-
xAAADsQBlSsOGwAAAX9JREFUOE+Fkk9qwkAUxtMDVLoptSfoCVwUunIREjyCSW8QvYogbixdFEIpWbjw
131-
AOLWS0QaEjeudZHN9P3GN6loSh98OPP9m0mMdzwezT+483Rkfa/L38HU7/dbsd/vmwL57QgKwZfg1oYZ
132-
2bSGwUXB23K5NIvFAm7TlFCAMcuyPwsE/m63M4PBwPJa8ukKgrIsTRiGVpzNZm0FL4fDoXBaEAQmz3O0
133-
Zwrep9OpFUajkRHjVYEe1BWtTJLEapPJBO0DIY/j2JKr1QqytYCR9SsetOFwiFZAGt/3LVlVlS0gCLjN
134-
RcEjHncAXsjaFfCiZP9E6Aw3msfbxYOXjOxryG0URZZcr9eQsfqvBg0PXjJkIefuJY7HY679LdyDZpqB
135-
Q8ODlwxZhF5RFPavcYKWxIKuIoZzB+ElQ9a1p3xliO4mXJXnBazdyQAvGRtmZMN3vkFwN2kDmob5lDsa
136-
P42WpFyNq/KSeNOANZxeO70Kn4+IPcFcsBXUCtZwp2duxvN+AFwMV+KqpemtAAAAAElFTkSuQmCC
137-
</value>
138-
</data>
139130
<data name="Button_Open_SaveData.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
140131
<value>
141132
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1
@@ -274,6 +265,18 @@
274265
RcEjHncAXsjaFfCiZP9E6Aw3msfbxYOXjOxryG0URZZcr9eQsfqvBg0PXjJkIefuJY7HY679LdyDZpqB
275266
Q8ODlwxZhF5RFPavcYKWxIKuIoZzB+ElQ9a1p3xliO4mXJXnBazdyQAvGRtmZMN3vkFwN2kDmob5lDsa
276267
P42WpFyNq/KSeNOANZxeO70Kn4+IPcFcsBXUCtZwp2duxvN+AFwMV+KqpemtAAAAAElFTkSuQmCC
268+
</value>
269+
</data>
270+
<data name="SectionButton_RefreshMods.SectionImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
271+
<value>
272+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
273+
xAAADsQBlSsOGwAAAX9JREFUOE+Fkk9qwkAUxtMDVLoptSfoCVwUunIREjyCSW8QvYogbixdFEIpWbjw
274+
AOLWS0QaEjeudZHN9P3GN6loSh98OPP9m0mMdzwezT+483Rkfa/L38HU7/dbsd/vmwL57QgKwZfg1oYZ
275+
2bSGwUXB23K5NIvFAm7TlFCAMcuyPwsE/m63M4PBwPJa8ukKgrIsTRiGVpzNZm0FL4fDoXBaEAQmz3O0
276+
Zwrep9OpFUajkRHjVYEe1BWtTJLEapPJBO0DIY/j2JKr1QqytYCR9SsetOFwiFZAGt/3LVlVlS0gCLjN
277+
RcEjHncAXsjaFfCiZP9E6Aw3msfbxYOXjOxryG0URZZcr9eQsfqvBg0PXjJkIefuJY7HY679LdyDZpqB
278+
Q8ODlwxZhF5RFPavcYKWxIKuIoZzB+ElQ9a1p3xliO4mXJXnBazdyQAvGRtmZMN3vkFwN2kDmob5lDsa
279+
P42WpFyNq/KSeNOANZxeO70Kn4+IPcFcsBXUCtZwp2duxvN+AFwMV+KqpemtAAAAAElFTkSuQmCC
277280
</value>
278281
</data>
279282
<data name="SectionButton_ClearLog.SectionImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

‎Sonic-06-Mod-Manager/src/UnifyPatcher.cs‎

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1247,8 +1247,7 @@ public static void ApplyTweaks(RushInterface rush) {
12471247
beginWithRings = Properties.Settings.Default.Tweak_BeginWithRings,
12481248
fieldOfView = Properties.Settings.Default.Tweak_FieldOfView;
12491249

1250-
bool forceMSAA = Properties.Settings.Default.Tweak_ForceMSAA,
1251-
tailsFlightLimit = Properties.Settings.Default.Tweak_TailsFlightLimit;
1250+
bool forceMSAA = Properties.Settings.Default.Tweak_ForceMSAA;
12521251

12531252
// Field of View
12541253
if (fieldOfView != 90 && system == "xenon") {
@@ -1401,7 +1400,6 @@ public static void ApplyTweaks(RushInterface rush) {
14011400

14021401
if (cameraHeight != 70) proceed++;
14031402
if (hammerRange != 50) proceed++;
1404-
if (!tailsFlightLimit) proceed++;
14051403
if (beginWithRings != 0) proceed++;
14061404

14071405
if (proceed != 0) {
@@ -1438,13 +1436,6 @@ public static void ApplyTweaks(RushInterface rush) {
14381436
BeginWithRings(Path.Combine(tweak, $"player\\{system}\\player\\"), beginWithRings);
14391437
}
14401438

1441-
// Unlock Tails' Flight Limit
1442-
if (tailsFlightLimit) {
1443-
rush.Status = $"Tweaking Characters...";
1444-
Console.WriteLine($"[{DateTime.Now:HH:mm:ss tt}] [Tweak] <player.arc> Unlocked Tails' flight limit...");
1445-
UnlockTailsFlightLimit(Path.Combine(tweak, $"player\\{system}\\player\\tails.lub"));
1446-
}
1447-
14481439
// Repack archive as tweak
14491440
ModEngine.RepackARC(tweak, archive);
14501441
}
@@ -1701,35 +1692,6 @@ private static void BeginWithRings(string directoryRoot, decimal rings) {
17011692
Console.WriteLine($"[{DateTime.Now:HH:mm:ss tt}] [Error] Begin with Rings\n{ex}");
17021693
ModEngine.skipped.Add("► Begin with Rings (check the debug log for more information)");
17031694
}
1704-
#endif
1705-
}
1706-
1707-
private static void UnlockTailsFlightLimit(string directoryRoot) {
1708-
#if !DEBUG
1709-
try {
1710-
#endif
1711-
PatchEngine.DecompileLua(directoryRoot);
1712-
string[] editedLua = File.ReadAllLines(directoryRoot);
1713-
int lineNum = 0;
1714-
decimal origTimer = 0;
1715-
1716-
foreach (string line in editedLua) {
1717-
string[] tempLine = line.Split(' ');
1718-
1719-
if (tempLine[0] == "c_flight_timer") origTimer = decimal.Parse(tempLine[2]);
1720-
1721-
if (tempLine[0] == "c_flight_timer_b") {
1722-
tempLine[2] = (((origTimer * 1000) + 125) / 1000).ToString();
1723-
editedLua[lineNum] = string.Join(" ", tempLine);
1724-
}
1725-
lineNum++;
1726-
}
1727-
File.WriteAllLines(directoryRoot, editedLua);
1728-
#if !DEBUG
1729-
} catch (Exception ex) {
1730-
Console.WriteLine($"[{DateTime.Now:HH:mm:ss tt}] [Error] Unlock Tails' Flight Limit\n{ex}");
1731-
ModEngine.skipped.Add("► Unlock Tails' Flight Limit (check the debug log for more information)");
1732-
}
17331695
#endif
17341696
}
17351697
}

0 commit comments

Comments
 (0)