Skip to content

Commit 87aece0

Browse files
author
HyperPolygon64
committed
Fixed FOV modifier bullshit and improved All Systems mods
 modified: Sonic-06-Mod-Manager/Properties/AssemblyInfo.cs modified: Sonic-06-Mod-Manager/src/Environment3/RushInterface.cs modified: Sonic-06-Mod-Manager/src/UnifyGlobalisation.cs modified: Sonic-06-Mod-Manager/src/UnifyPatcher.cs modified: Sonic-06-Mod-Manager/src/UnifyProgram.cs
1 parent 3df5fd4 commit 87aece0

File tree

5 files changed

+22
-15
lines changed

5 files changed

+22
-15
lines changed

‎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.1.6.0")]
15+
[assembly: AssemblyFileVersion("3.1.7.0")]

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1138,7 +1138,12 @@ private void SectionButton_InstallMods_Click(object sender, EventArgs e) {
11381138
Label_Status.Text = $"Installing {mod.Text}...";
11391139

11401140
// Install the specified mod
1141-
ModEngine.InstallMods(mod.SubItems[6].Text, mod.Text);
1141+
try { ModEngine.InstallMods(mod.SubItems[6].Text, mod.Text); }
1142+
catch (Exception ex) {
1143+
UnifyMessenger.UnifyMessage.ShowDialog($"An error occurred whilst installing your mods...\n\n{ex}",
1144+
"Installation failed", MessageBoxButtons.OK, MessageBoxIcon.Error);
1145+
return;
1146+
}
11421147

11431148
if (Properties.Settings.Default.General_SaveFileRedirection)
11441149
// Redirect save data from the specified mod

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public static string OppositeSystem(string path) {
6464
/// </summary>
6565
public static string Emulator(string path) {
6666
if (Path.GetExtension(path).ToLower() == ".xex") return "Xenia";
67-
if (Path.GetExtension(path).ToLower() == ".bin") return "RPCS3";
67+
else if (Path.GetExtension(path).ToLower() == ".bin") return "RPCS3";
6868
else return "unspecified";
6969
}
7070

@@ -73,23 +73,25 @@ public static string Emulator(string path) {
7373
/// </summary>
7474
public static string Core(string path) {
7575
if (Path.GetExtension(path).ToLower() == ".xex") return "xenon";
76-
if (Path.GetExtension(path).ToLower() == ".bin") return "ps3";
76+
else if (Path.GetExtension(path).ToLower() == ".bin") return "ps3";
7777
else return "core";
7878
}
7979

8080
/// <summary>
8181
/// Renames the 'core' folder to the appropriate system root.
8282
/// </summary>
8383
public static string CoreReplace(string path) {
84+
string system = System(Properties.Settings.Default.Path_GameDirectory);
85+
8486
if (Paths.GetRootFolder(path) == "core") {
8587
string[] splitPath = path.Split('\\');
8688

8789
for (int i = 0; i < splitPath.Length; i++) {
88-
if (splitPath[i] == "core" && System(Properties.Settings.Default.Path_GameDirectory) == "Xbox 360") {
90+
if (splitPath[i] == "core" && system == "Xbox 360") {
8991
splitPath[i] = "xenon";
9092
return string.Join("\\", splitPath);
9193
}
92-
else if (splitPath[i] == "core" && System(Properties.Settings.Default.Path_GameDirectory) == "PlayStation 3") {
94+
else if (splitPath[i] == "core" && system == "PlayStation 3") {
9395
splitPath[i] = "ps3";
9496
return string.Join("\\", splitPath);
9597
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@ public static void InstallMods(string mod, string name) {
7575
s.EndsWith(".at3")).ToList();
7676

7777
foreach (string file in files) {
78-
// Absolute file path (xenon/win32 and beyond)
79-
string filePath = file.Remove(0, Path.GetDirectoryName(mod).Length);
78+
// Absolute file path (core/xenon/win32 and beyond)
79+
string filePath = Literal.CoreReplace(file.Remove(0, Path.GetDirectoryName(mod).Length).Substring(1));
8080

8181
// Absolute file path (from the mod) combined with the game directory
82-
string vanillaFilePath = Path.Combine(Path.GetDirectoryName(Properties.Settings.Default.Path_GameDirectory), filePath.Substring(1));
82+
string vanillaFilePath = Path.Combine(Path.GetDirectoryName(Properties.Settings.Default.Path_GameDirectory), filePath);
8383

8484
// Backup file path derived from the file about to be overwritten
8585
string targetFilePath = $"{vanillaFilePath}_back";
@@ -454,9 +454,9 @@ public static void InstallPatches(string patch, string name) {
454454
}
455455

456456
if (line.StartsWith("Parameter")) {
457-
string[] _ParameterAdd = Lua.DeserialiseParameterList("ParameterAdd", line, false), // Deserialise 'ParameterEdit' parameter
458-
_ParameterEdit = Lua.DeserialiseParameterList("ParameterEdit", line, false), // Deserialise 'ParameterEdit' parameter
459-
_ParameterErase = Lua.DeserialiseParameterList("ParameterErase", line, false), // Deserialise 'ParameterErase' parameter
457+
string[] _ParameterAdd = Lua.DeserialiseParameterList("ParameterAdd", line, false), // Deserialise 'ParameterEdit' parameter
458+
_ParameterEdit = Lua.DeserialiseParameterList("ParameterEdit", line, false), // Deserialise 'ParameterEdit' parameter
459+
_ParameterErase = Lua.DeserialiseParameterList("ParameterErase", line, false), // Deserialise 'ParameterErase' parameter
460460
_ParameterRename = Lua.DeserialiseParameterList("ParameterRename", line, false); // Deserialise 'ParameterRename' parameter
461461

462462
if (line.StartsWith("ParameterAdd") && _ParameterAdd.Length != 0)
@@ -477,7 +477,7 @@ public static void InstallPatches(string patch, string name) {
477477
}
478478

479479
if (line.StartsWith("Package")) {
480-
string[] _PackageAdd = Lua.DeserialiseParameterList("PackageAdd", line, false), // Deserialise 'PackageAdd' parameter
480+
string[] _PackageAdd = Lua.DeserialiseParameterList("PackageAdd", line, false), // Deserialise 'PackageAdd' parameter
481481
_PackageEdit = Lua.DeserialiseParameterList("PackageEdit", line, false); // Deserialise 'PackageEdit' parameter
482482

483483
if (line.StartsWith("PackageAdd") && _PackageAdd.Length != 0)
@@ -984,7 +984,7 @@ public static void ApplyTweaks(RushInterface rush) {
984984
tailsFlightLimit = Properties.Settings.Default.Tweak_TailsFlightLimit;
985985

986986
// Field of View
987-
if (fieldOfView != 90 && system == "Xbox 360") {
987+
if (fieldOfView != 90 && system == "xenon") {
988988
string xex = Path.Combine(gameDirectory, "default.xex"); // Location of the XEX
989989

990990
if (!File.Exists($"{xex}_back"))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ namespace Unify.Environment3
3737
{
3838
static class Program
3939
{
40-
public static readonly string VersionNumber = "Version 3.16"; //-indev-{DateTime.Now.ToString("ddMMyy")}r1";
40+
public static readonly string VersionNumber = "Version 3.17"; //-indev-{DateTime.Now.ToString("ddMMyy")}r1";
4141

4242
public static string ApplicationData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
4343
_7Zip = $"{ApplicationData}\\Unify\\Tools\\7z.exe",

0 commit comments

Comments
 (0)