From 5400e7d9f0a12781e021192d1a616c6b48f2c499 Mon Sep 17 00:00:00 2001 From: 13xforever Date: Mon, 14 Oct 2019 00:57:21 +0500 Subject: [PATCH] move some general notes from settings section --- ...serResultFormatter.WeirdSettingsSection.cs | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.WeirdSettingsSection.cs b/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.WeirdSettingsSection.cs index 4022db0b..e4ee5d2d 100644 --- a/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.WeirdSettingsSection.cs +++ b/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.WeirdSettingsSection.cs @@ -10,7 +10,7 @@ namespace CompatBot.Utils.ResultFormatters { internal static partial class LogParserResult { - private static void BuildWeirdSettingsSection(DiscordEmbedBuilder builder, NameValueCollection items) + private static void BuildWeirdSettingsSection(DiscordEmbedBuilder builder, NameValueCollection items, List generalNotes) { var notes = new List(); var serial = items["serial"] ?? ""; @@ -79,18 +79,18 @@ namespace CompatBot.Utils.ResultFormatters { CheckP5Settings(serial, items, notes); CheckAsurasWrathSettings(serial, items, notes); - CheckJojoSettings(serial, items, notes, ppuPatches, ppuHashes); - CheckSimpsonsSettings(serial, notes); - CheckNierSettings(serial, items, notes, ppuPatches, ppuHashes); - CheckDod3Settings(serial, items, notes, ppuPatches, ppuHashes); + CheckJojoSettings(serial, items, notes, ppuPatches, ppuHashes, generalNotes); + CheckSimpsonsSettings(serial, generalNotes); + CheckNierSettings(serial, items, notes, ppuPatches, ppuHashes, generalNotes); + CheckDod3Settings(serial, items, notes, ppuPatches, ppuHashes, generalNotes); CheckScottPilgrimSettings(serial, items, notes); - CheckGoWSettings(serial, items, notes); - CheckDesSettings(serial, items, notes, ppuPatches, ppuHashes); + CheckGoWSettings(serial, items, notes, generalNotes); + CheckDesSettings(serial, items, notes, ppuPatches, ppuHashes, generalNotes); CheckTlouSettings(serial, items, notes); - CheckMgs4Settings(serial, items, notes); + CheckMgs4Settings(serial, generalNotes); } else if (items["game_title"] == "vsh.self") - CheckVshSettings(items, notes); + CheckVshSettings(items, notes, generalNotes); if (items["game_category"] == "1P") CheckPs1ClassicsSettings(items, notes); @@ -176,7 +176,7 @@ namespace CompatBot.Utils.ResultFormatters && KnownMotionControlsIds.Contains(serial) && items["pad_handler"] is string padHandler && !padHandler.StartsWith("DualShock")) - notes.Add("❗ This game requires motion controls, please use DS3 or DS4 gamepad"); + notes.Add("❗ This game requires motion controls, please use native handler for DualShock 3 or DualShock 4 controller"); if (items["audio_backend"] is string audioBackend && !string.IsNullOrEmpty(audioBackend)) { @@ -310,7 +310,7 @@ namespace CompatBot.Utils.ResultFormatters "18cf9a4e8196684ed9ee816f82649561fd1bf182", }; - private static void CheckJojoSettings(string serial, NameValueCollection items, List notes, Dictionary ppuPatches, HashSet ppuHashes) + private static void CheckJojoSettings(string serial, NameValueCollection items, List notes, Dictionary ppuPatches, HashSet ppuHashes, List generalNotes) { if (AllStarBattleIds.Contains(serial) || serial == "BLJS10318" || serial == "NPJB00753") { @@ -337,17 +337,17 @@ namespace CompatBot.Utils.ResultFormatters if (vbr > 60) notes.Add("ℹ Unlocking FPS requires game patch"); if (ppuHashes.Overlaps(KnownJojoPatches)) - notes.Add("ℹ This game has an FPS unlock patch, see [Game Patches](https://github.com/RPCS3/rpcs3/wiki/Game-Patches)"); + generalNotes.Add("ℹ This game has an FPS unlock patch, see [Game Patches](https://github.com/RPCS3/rpcs3/wiki/Game-Patches)"); } } } } - private static void CheckSimpsonsSettings(string serial, List notes) + private static void CheckSimpsonsSettings(string serial, List generalNotes) { if (serial == "BLES00142" || serial == "BLUS30065") { - notes.Add("ℹ This game has a controller initialization bug. Simply unplug and replug it until it works."); + generalNotes.Add("ℹ This game has a controller initialization bug. Simply unplug and replug it until it works."); } } @@ -357,7 +357,7 @@ namespace CompatBot.Utils.ResultFormatters "f098ee8410599c81c89f90d698340a078dc69a90", }; - private static void CheckNierSettings(string serial, NameValueCollection items, List notes, Dictionary ppuPatches, HashSet ppuHashes) + private static void CheckNierSettings(string serial, NameValueCollection items, List notes, Dictionary ppuPatches, HashSet ppuHashes, List generalNotes) { if (serial == "BLUS30481" || serial == "BLES00826" || serial == "BLJM60223") { @@ -390,7 +390,7 @@ namespace CompatBot.Utils.ResultFormatters if (frameLimit != "30") notes.Add("⚠ Please set `Framerate Limiter` to 30 fps"); if (ppuHashes.Overlaps(KnownNierPatches)) - notes.Add("ℹ This game has an FPS unlock patch, see [Game Patches](https://github.com/RPCS3/rpcs3/wiki/Game-Patches#nier)"); + generalNotes.Add("ℹ This game has an FPS unlock patch, see [Game Patches](https://github.com/RPCS3/rpcs3/wiki/Game-Patches#nier)"); } if (serial == "BLJM60223" && items["native_ui"] == EnabledMark) @@ -430,7 +430,7 @@ namespace CompatBot.Utils.ResultFormatters "NPHA80258", }; - private static void CheckGoWSettings(string serial, NameValueCollection items, List notes) + private static void CheckGoWSettings(string serial, NameValueCollection items, List notes, List generalNotes) { if (serial == "NPUA70080") // GoW3 Demo return; @@ -442,7 +442,7 @@ namespace CompatBot.Utils.ResultFormatters } else if (Gow3Ids.Contains(serial)) { - notes.Add("ℹ Black screen after Santa Monica logo is fine for up to 5 minutes"); + generalNotes.Add("ℹ Black screen after Santa Monica logo is fine for up to 5 minutes"); if (items["spu_decoder"] is string spuDecoder && spuDecoder.Contains("LLVM") && items["spu_block_size"] is string blockSize @@ -450,7 +450,7 @@ namespace CompatBot.Utils.ResultFormatters notes.Add("⚠ Please change `SPU Block Size` to `Mega` for this game"); } else if (GowAscIds.Contains(serial)) - notes.Add("ℹ This game is known to be very unstable"); + generalNotes.Add("ℹ This game is known to be very unstable"); } private static readonly HashSet DesIds = new HashSet @@ -465,7 +465,7 @@ namespace CompatBot.Utils.ResultFormatters "5446a2645880eefa75f7e374abd6b7818511e2ef", }; - private static void CheckDesSettings(string serial, NameValueCollection items, List notes, Dictionary ppuPatches, HashSet ppuHashes) + private static void CheckDesSettings(string serial, NameValueCollection items, List notes, Dictionary ppuPatches, HashSet ppuHashes, List generalNotes) { if (!DesIds.Contains(serial)) return; @@ -505,7 +505,7 @@ namespace CompatBot.Utils.ResultFormatters if (vblankRate > 60) notes.Add("ℹ Unlocking FPS requires game patch"); if (ppuHashes.Overlaps(KnownDesPatches)) - notes.Add("ℹ This game has an FPS unlock patch, see [Game Patches](https://github.com/RPCS3/rpcs3/wiki/Game-Patches#demons-souls)"); + generalNotes.Add("ℹ This game has an FPS unlock patch, see [Game Patches](https://github.com/RPCS3/rpcs3/wiki/Game-Patches#demons-souls)"); } } else if (ppuPatches.Any()) @@ -533,7 +533,7 @@ namespace CompatBot.Utils.ResultFormatters "5eb979631fbbe531db5d20f0622dca5a8b64090e", }; - private static void CheckDod3Settings(string serial, NameValueCollection items, List notes, Dictionary ppuPatches, HashSet ppuHashes) + private static void CheckDod3Settings(string serial, NameValueCollection items, List notes, Dictionary ppuPatches, HashSet ppuHashes, List generalNotes) { if (!Dod3Ids.Contains(serial)) return; @@ -557,9 +557,9 @@ namespace CompatBot.Utils.ResultFormatters if (vbr > 60) notes.Add("ℹ Unlocking FPS requires game patch"); if (ppuHashes.Overlaps(KnownDod3Patches)) - notes.Add("ℹ This game has an FPS unlock patch, see [Game Patches](https://github.com/RPCS3/rpcs3/wiki/Game-Patches#drakengard-3)"); + generalNotes.Add("ℹ This game has an FPS unlock patch, see [Game Patches](https://github.com/RPCS3/rpcs3/wiki/Game-Patches#drakengard-3)"); else if (ppuHashes.Any()) - notes.Add("🤔 Very interesting version of the game you got there"); + generalNotes.Add("🤔 Very interesting version of the game you got there"); } } } @@ -605,20 +605,20 @@ namespace CompatBot.Utils.ResultFormatters "NPHB00065", "NPHB00067", }; - private static void CheckMgs4Settings(string serial, NameValueCollection items, List notes) + private static void CheckMgs4Settings(string serial, List generalNotes) { if (!Mgs4Ids.Contains(serial)) return; - notes.Add("ℹ Metal Gear Solid 4 just got ingame, and is still very unstable"); - notes.Add("ℹ There is no universal set of settings and game updates that works for everyone"); + generalNotes.Add("ℹ Metal Gear Solid 4 just got ingame, and is still very unstable"); + generalNotes.Add("ℹ There is no universal set of settings and game updates that works for everyone"); } - private static void CheckVshSettings(NameValueCollection items, List notes) + private static void CheckVshSettings(NameValueCollection items, List notes, List generalNotes) { if (items["build_branch"] is string branch && !branch.Contains("vsh", StringComparison.InvariantCultureIgnoreCase)) - notes.Add("ℹ Booting `vsh.self` currently requires a special build"); + generalNotes.Add("ℹ Booting `vsh.self` currently requires a special build"); if (items["lib_loader"] is string libLoader && libLoader != "Manual selection") notes.Add("⚠ `Library Loader` must be set to `Manual`");