From 1efaa896bcc24fbf079323c4a12b62f366321027 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 13 Sep 2014 01:21:55 +0000 Subject: [PATCH] Add a N64 TAS profile in the profile config, has identical settings to TAS but also the Frame Advance skips Lag Frames option set to true --- BizHawk.Client.Common/config/Config.cs | 1 + .../config/ProfileConfig.Designer.cs | 1 + .../config/ProfileConfig.cs | 71 ++++++++++++++++++- 3 files changed, 71 insertions(+), 2 deletions(-) diff --git a/BizHawk.Client.Common/config/Config.cs b/BizHawk.Client.Common/config/Config.cs index ce7d8dc311..88a2b11f53 100644 --- a/BizHawk.Client.Common/config/Config.cs +++ b/BizHawk.Client.Common/config/Config.cs @@ -115,6 +115,7 @@ namespace BizHawk.Client.Common Casual = 1, Longplay = 2, Tas = 3, + N64Tas = 4, Custom = 99 } diff --git a/BizHawk.Client.EmuHawk/config/ProfileConfig.Designer.cs b/BizHawk.Client.EmuHawk/config/ProfileConfig.Designer.cs index 9c2d449ffc..10bc9afee1 100644 --- a/BizHawk.Client.EmuHawk/config/ProfileConfig.Designer.cs +++ b/BizHawk.Client.EmuHawk/config/ProfileConfig.Designer.cs @@ -73,6 +73,7 @@ this.ProfileSelectComboBox.Items.AddRange(new object[] { "Casual Gaming", "Tool-assisted Speedruns", + "N64 Tool-assisted Speedruns", "Longplays", "Custom Profile"}); this.ProfileSelectComboBox.Location = new System.Drawing.Point(22, 20); diff --git a/BizHawk.Client.EmuHawk/config/ProfileConfig.cs b/BizHawk.Client.EmuHawk/config/ProfileConfig.cs index 37fead5817..28f11d84f6 100644 --- a/BizHawk.Client.EmuHawk/config/ProfileConfig.cs +++ b/BizHawk.Client.EmuHawk/config/ProfileConfig.cs @@ -42,6 +42,9 @@ namespace BizHawk.Client.EmuHawk case Config.ClientProfile.Tas: ProfileSelectComboBox.SelectedItem = "Tool-assisted Speedruns"; break; + case Config.ClientProfile.N64Tas: + ProfileSelectComboBox.SelectedItem = "N64 Tool-assisted Speedruns"; + break; } } @@ -58,6 +61,7 @@ namespace BizHawk.Client.EmuHawk Global.Config.RewindEnabledLarge = false; Global.Config.RewindEnabledMedium = false; Global.Config.RewindEnabledSmall = true; + Global.Config.SkipLagFrame = false; // N64 var n64Settings = GetSyncSettings(); @@ -101,13 +105,14 @@ namespace BizHawk.Client.EmuHawk // NES Global.Config.NES_InQuickNES = true; } - else if (ProfileSelectComboBox.SelectedIndex == 2) // Long Plays + else if (ProfileSelectComboBox.SelectedIndex == 3) // Long Plays { DisplayProfileSettingBoxes(false); Global.Config.SaveLargeScreenshotWithStates = false; Global.Config.SaveScreenshotWithStates = false; Global.Config.AllowUD_LR = false; Global.Config.BackupSavestates = false; + Global.Config.SkipLagFrame = false; Global.Config.RewindEnabledLarge = false; Global.Config.RewindEnabledMedium = false; @@ -164,6 +169,7 @@ namespace BizHawk.Client.EmuHawk Global.Config.SaveScreenshotWithStates = true; Global.Config.AllowUD_LR = true; Global.Config.BackupSavestates = true; + Global.Config.SkipLagFrame = false; // Rewind Global.Config.RewindEnabledLarge = false; @@ -212,7 +218,65 @@ namespace BizHawk.Client.EmuHawk // NES Global.Config.NES_InQuickNES = true; } - else if (ProfileSelectComboBox.SelectedIndex == 3) //custom + else if (ProfileSelectComboBox.SelectedIndex == 2) // N64 TAS + { + DisplayProfileSettingBoxes(false); + + // General + Global.Config.SaveLargeScreenshotWithStates = true; + Global.Config.SaveScreenshotWithStates = true; + Global.Config.AllowUD_LR = true; + Global.Config.BackupSavestates = true; + Global.Config.SkipLagFrame = true; + + // Rewind + Global.Config.RewindEnabledLarge = false; + Global.Config.RewindEnabledMedium = false; + Global.Config.RewindEnabledSmall = false; + + // N64 + var n64Settings = GetSyncSettings(); + n64Settings.Rsp = N64SyncSettings.RspType.Rsp_Z64_hlevideo; + n64Settings.Core = N64SyncSettings.CoreType.Pure_Interpret; + Global.Config.N64UseCircularAnalogConstraint = false; + PutSyncSettings(n64Settings); + + // SNES + var snesSettings = GetSyncSettings(); + snesSettings.Profile = "Compatibility"; + PutSyncSettings(snesSettings); + + // Saturn + var saturnSettings = GetSyncSettings(); + saturnSettings.SkipBios = true; + PutSyncSettings(saturnSettings); + + // Genesis + var genesisSettings = GetSyncSettings(); + genesisSettings.Region = LibGPGX.Region.Autodetect; + PutSyncSettings(genesisSettings); + + // SMS + var smsSettings = GetSyncSettings(); + smsSettings.UseBIOS = false; + PutSyncSettings(smsSettings); + + // Coleco + var colecoSettings = GetSyncSettings(); + colecoSettings.SkipBiosIntro = true; + PutSyncSettings(colecoSettings); + + // A2600 + var a2600Settings = GetSyncSettings(); + a2600Settings.FastScBios = false; + a2600Settings.LeftDifficulty = true; + a2600Settings.RightDifficulty = true; + PutSyncSettings(a2600Settings); + + // NES + Global.Config.NES_InQuickNES = true; + } + else if (ProfileSelectComboBox.SelectedIndex == 4) //custom { //Disabled for now //DisplayProfileSettingBoxes(true); @@ -231,6 +295,9 @@ namespace BizHawk.Client.EmuHawk case "Tool-assisted Speedruns": Global.Config.SelectedProfile = Config.ClientProfile.Tas; break; + case "N64 Tool-assisted Speedruns": + Global.Config.SelectedProfile = Config.ClientProfile.N64Tas; + break; } DialogResult = DialogResult.OK;