Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-22 20:13:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add Control key modifier to set shiny button to change the pokemon SID instead of the PID, that allow the change shiny of gen 3/4 pokemon without turn the pokemon in illegal because PID/IV mistmatch

Browse source 
Added Cherrygrove City to surf headbutt encounter locations, the upper right trees on the map can be reach from the water in route 30
This commit is contained in:
javierhimura 2017-06-03 12:02:22 +02:00
parent 5823425f42
commit 814e63aa1c
4 changed files with 36 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
PKHeX.Core/Legality/Tables4.cs
View file

@ -282,8 +282,9 @@ namespace PKHeX.Core
227, // Safari Zone Gate
};
internal static readonly int[] HGSS_SurfingHeadbutt_Locations =
{ // Locations with headbutt trees adjacent to water tiles
{ // Locations with headbutt trees adjacent to water tiles
126, // New Bark Town
127, // Cherrygrove City
128, // Violet City
133, // Ecruteak City
135, // Lake of Rage
@ -306,7 +307,7 @@ namespace PKHeX.Core
214, // Ilex Forest
};
internal static readonly int[] HGSS_GrassHeadbutt_Locations =
{ // Locations with headbutt trees adjacent to tall grass tiles
{ // Locations with headbutt trees adjacent to tall grass tiles
137, // Mt. Silver
149, // Route 1
150, // Route 2

8
PKHeX.Core/PKM/PKM.cs
View file

@ -767,6 +767,14 @@ namespace PKHeX.Core
EncryptionConstant = PID;
}
/// <summary>
/// Applies a shiny SID to the <see cref="PKM"/>.
/// </summary>
public void setShinySID()
{
if (IsShiny) return;
do SID = Util.rnd16(); while (!IsShiny);
}
/// <summary>
/// Applies a PID to the <see cref="PKM"/> according to the specified <see cref="Gender"/>.
/// </summary>
/// <remarks>

4
PKHeX.Core/Util/RandUtil.cs
View file

@ -9,6 +9,10 @@ namespace PKHeX.Core
{
return (uint)rand.Next(1 << 30) << 2 | (uint)rand.Next(1 << 2);
}
internal static ushort rnd16()
{
return (ushort)rand.Next(ushort.MaxValue);
}
public static void Shuffle<T>(T[] array)
{
int n = array.Length;

27
PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs
View file

@ -1471,6 +1471,11 @@ namespace PKHeX.WinForms.Controls
updateLegality();
}
private void updateShinyPID(object sender, EventArgs e)
{
var ShinyPID = pkm.Format <= 2 || ModifierKeys != Keys.Control;
updateShiny(ShinyPID);
}
private void updateShiny(bool PID)
{
pkm.TID = Util.ToInt32(TB_TID.Text);
pkm.SID = Util.ToInt32(TB_SID.Text);
@ -1481,7 +1486,21 @@ namespace PKHeX.WinForms.Controls
pkm.Version = WinFormsUtil.getIndex(CB_GameOrigin);
if (pkm.Format > 2)
pkm.setShinyPID();
{
if(PID)
{
pkm.setShinyPID();
TB_PID.Text = pkm.PID.ToString("X8");
if (pkm.GenNumber < 6 && TB_EC.Visible)
TB_EC.Text = TB_PID.Text;
}
else
{
pkm.setShinySID();
TB_SID.Text = pkm.SID.ToString();
}
}
else
{
// IVs determine shininess
@ -1502,10 +1521,6 @@ namespace PKHeX.WinForms.Controls
TB_SPAIV.Text = "10";
updateIVs(null, null);
}
TB_PID.Text = pkm.PID.ToString("X8");
if (pkm.GenNumber < 6 && TB_EC.Visible)
TB_EC.Text = TB_PID.Text;
setIsShiny(null);
UpdatePreviewSprite?.Invoke(this, null);
@ -1926,7 +1941,7 @@ namespace PKHeX.WinForms.Controls
for (int i = 0; i < 4; i++)
p[i].SelectedIndex = m[i].SelectedIndex != 0 ? 3 : 0; // max PP
if (Set.Shiny) updateShinyPID(null, null);
if (Set.Shiny) updateShiny(true);
pkm = preparePKM();
updateLegality();
}