From c083a2e5653152a163316856653a7cf1e06a271e Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 28 Feb 2017 22:06:47 -0800 Subject: [PATCH 1/4] Add past-gen genderless apricorn inheritance Closes #906 Other species may not have been in the Inherit_Apricorn6 array, but they are covered in the AlolanScans/Offspring tables. --- PKHeX/Legality/Tables7.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/PKHeX/Legality/Tables7.cs b/PKHeX/Legality/Tables7.cs index ddda120aa..39e68cd8c 100644 --- a/PKHeX/Legality/Tables7.cs +++ b/PKHeX/Legality/Tables7.cs @@ -430,7 +430,16 @@ namespace PKHeX.Core 769, 771, 774, 775, 776, 777, 778, 779, 780, 781, 782 }; - internal static readonly int[] Inherit_Apricorn7 = Inherit_Apricorn6.Concat(PastGenAlolanScans).Concat(AlolanCaptureOffspring).Distinct().ToArray(); + internal static readonly int[] Inherit_ApricornMale7 = + { + 100, // Voltorb + 343, // Baltoy + 436, // Bronzor + + // Others are capturable in the Alola region + // Magnemite, Staryu, Tauros + }; + internal static readonly int[] Inherit_Apricorn7 = Inherit_Apricorn6.Concat(Inherit_ApricornMale7).Concat(PastGenAlolanScans).Concat(AlolanCaptureOffspring).Distinct().ToArray(); internal static readonly int[] Inherit_SafariMale = { 128, // Tauros From 58bd3640b4ddec53267980a3bf17546c027bc2b2 Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 28 Feb 2017 23:13:23 -0800 Subject: [PATCH 2/4] Fix order of operation Closes #909 yeah bit shifts are after +/- silly me --- PKHeX/Saves/SAV4.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKHeX/Saves/SAV4.cs b/PKHeX/Saves/SAV4.cs index 8cab4befc..75a7ff4b9 100644 --- a/PKHeX/Saves/SAV4.cs +++ b/PKHeX/Saves/SAV4.cs @@ -759,7 +759,7 @@ namespace PKHeX.Core const int brSize = 0x40; int bit = pkm.Species - 1; byte mask = (byte) (1 << (bit&7)); - int ofs = PokeDex + bit>>3 + 0x4; + int ofs = PokeDex + (bit>>3) + 0x4; // Set the Species Owned Flag Data[ofs + brSize*0] |= mask; From 9df18d2bd1cb6cf6910359b64b38d1cf991413bb Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 28 Feb 2017 23:23:58 -0800 Subject: [PATCH 3/4] Tweak gen3 sav load to force version prompt Hold Control when opening the save file Closes #887 --- PKHeX.WinForms/MainWindow/Main.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKHeX.WinForms/MainWindow/Main.cs b/PKHeX.WinForms/MainWindow/Main.cs index d2af5f77e..b2985a230 100644 --- a/PKHeX.WinForms/MainWindow/Main.cs +++ b/PKHeX.WinForms/MainWindow/Main.cs @@ -877,11 +877,11 @@ namespace PKHeX.WinForms } } // Finish setting up the save file. - if (sav.IndeterminateGame && sav.Generation == 3) + if (sav.Generation == 3 && (sav.IndeterminateGame || ModifierKeys == Keys.Control)) { // Hacky cheats invalidated the Game Code value. var drGame = WinFormsUtil.Prompt(MessageBoxButtons.YesNoCancel, - "Unknown Gen3 Game Detected. Select Origins:", + "Gen3 Game Detected. Select Origins:", "Yes: Ruby / Sapphire" + Environment.NewLine + "No: Emerald" + Environment.NewLine + "Cancel: FireRed / LeafGreen"); From 91459f66a7e2cac849aeb305067a4f1e73af9c2a Mon Sep 17 00:00:00 2001 From: Evan Dixon Date: Wed, 1 Mar 2017 14:50:38 -0600 Subject: [PATCH 4/4] Made clickonce less intrusive to normal builds --- PKHeX.WinForms/PKHeX.WinForms.csproj | 35 +++++++++++++++++++++++----- PKHeX.sln | 14 +++++++++++ PKHeX/PKHeX.Core.csproj | 8 +++---- 3 files changed, 47 insertions(+), 10 deletions(-) diff --git a/PKHeX.WinForms/PKHeX.WinForms.csproj b/PKHeX.WinForms/PKHeX.WinForms.csproj index d1f69f1df..6547d7faa 100644 --- a/PKHeX.WinForms/PKHeX.WinForms.csproj +++ b/PKHeX.WinForms/PKHeX.WinForms.csproj @@ -35,7 +35,7 @@ true bin\x86\Debug\ - DEBUG;CLICKONCE;WINDOWS + DEBUG;WINDOWS full x86 false @@ -45,7 +45,7 @@ bin\x86\Release\ - CLICKONCE;WINDOWS + WINDOWS true pdbonly x86 @@ -77,7 +77,7 @@ true bin\Debug\ - DEBUG;CLICKONCE;WINDOWS + DEBUG;WINDOWS full AnyCPU false @@ -87,7 +87,7 @@ bin\Release\ - CLICKONCE;WINDOWS + WINDOWS true pdbonly AnyCPU @@ -116,15 +116,38 @@ MinimumRecommendedRules.ruleset true + + bin\x86\ClickOnce\ + CLICKONCE;WINDOWS + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + true + + + bin\ClickOnce\ + CLICKONCE;WINDOWS + true + pdbonly + AnyCPU + prompt + MinimumRecommendedRules.ruleset + true + true + - + - + + + Form diff --git a/PKHeX.sln b/PKHeX.sln index 03b0d2f8a..19eb27df4 100644 --- a/PKHeX.sln +++ b/PKHeX.sln @@ -19,6 +19,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PKHeX.WinForms", "PKHeX.Win EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + ClickOnce|Any CPU = ClickOnce|Any CPU + ClickOnce|x86 = ClickOnce|x86 Debug|Any CPU = Debug|Any CPU Debug|x86 = Debug|x86 Mono-Debug|Any CPU = Mono-Debug|Any CPU @@ -29,6 +31,10 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.ClickOnce|Any CPU.ActiveCfg = Release|Any CPU + {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.ClickOnce|Any CPU.Build.0 = Release|Any CPU + {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.ClickOnce|x86.ActiveCfg = Release|x86 + {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.ClickOnce|x86.Build.0 = Release|x86 {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.Debug|Any CPU.Build.0 = Debug|Any CPU {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.Debug|x86.ActiveCfg = Debug|x86 @@ -45,6 +51,10 @@ Global {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.Release|Any CPU.Build.0 = Release|Any CPU {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.Release|x86.ActiveCfg = Release|x86 {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.Release|x86.Build.0 = Release|x86 + {8E2499BC-C11A-4809-8737-66D35A625425}.ClickOnce|Any CPU.ActiveCfg = Release|Any CPU + {8E2499BC-C11A-4809-8737-66D35A625425}.ClickOnce|Any CPU.Build.0 = Release|Any CPU + {8E2499BC-C11A-4809-8737-66D35A625425}.ClickOnce|x86.ActiveCfg = Release|x86 + {8E2499BC-C11A-4809-8737-66D35A625425}.ClickOnce|x86.Build.0 = Release|x86 {8E2499BC-C11A-4809-8737-66D35A625425}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8E2499BC-C11A-4809-8737-66D35A625425}.Debug|Any CPU.Build.0 = Debug|Any CPU {8E2499BC-C11A-4809-8737-66D35A625425}.Debug|x86.ActiveCfg = Debug|x86 @@ -57,6 +67,10 @@ Global {8E2499BC-C11A-4809-8737-66D35A625425}.Release|Any CPU.Build.0 = Release|Any CPU {8E2499BC-C11A-4809-8737-66D35A625425}.Release|x86.ActiveCfg = Release|x86 {8E2499BC-C11A-4809-8737-66D35A625425}.Release|x86.Build.0 = Release|x86 + {D1B91861-A448-4762-A313-C7BC179F4415}.ClickOnce|Any CPU.ActiveCfg = ClickOnce|Any CPU + {D1B91861-A448-4762-A313-C7BC179F4415}.ClickOnce|Any CPU.Build.0 = ClickOnce|Any CPU + {D1B91861-A448-4762-A313-C7BC179F4415}.ClickOnce|x86.ActiveCfg = Release|x86 + {D1B91861-A448-4762-A313-C7BC179F4415}.ClickOnce|x86.Build.0 = Release|x86 {D1B91861-A448-4762-A313-C7BC179F4415}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D1B91861-A448-4762-A313-C7BC179F4415}.Debug|Any CPU.Build.0 = Debug|Any CPU {D1B91861-A448-4762-A313-C7BC179F4415}.Debug|x86.ActiveCfg = Debug|x86 diff --git a/PKHeX/PKHeX.Core.csproj b/PKHeX/PKHeX.Core.csproj index 0d7c461c9..c9793f10c 100644 --- a/PKHeX/PKHeX.Core.csproj +++ b/PKHeX/PKHeX.Core.csproj @@ -75,7 +75,7 @@ true bin\x86\Debug\ - DEBUG;CLICKONCE;WINDOWS + DEBUG;WINDOWS full x86 false @@ -85,7 +85,7 @@ false - CLICKONCE;WINDOWS + WINDOWS bin\x86\Release\ true pdbonly @@ -122,7 +122,7 @@ true bin\Debug\ - DEBUG;CLICKONCE;WINDOWS + DEBUG;WINDOWS full AnyCPU false @@ -132,7 +132,7 @@ bin\Release\ - CLICKONCE;WINDOWS + WINDOWS true pdbonly AnyCPU