mirror of
https://github.com/kwsch/PKHeX
synced 2024-11-15 00:37:11 +00:00
Add gen3 met locations
English only for now.
This commit is contained in:
parent
ee4a846aee
commit
df51269c7e
5 changed files with 78 additions and 7 deletions
|
@ -141,6 +141,7 @@ namespace PKHeX
|
||||||
public static string[] specieslist, movelist, itemlist, abilitylist, types, natures, forms,
|
public static string[] specieslist, movelist, itemlist, abilitylist, types, natures, forms,
|
||||||
memories, genloc, trainingbags, trainingstage, characteristics,
|
memories, genloc, trainingbags, trainingstage, characteristics,
|
||||||
encountertypelist, gamelanguages, balllist, gamelist, pokeblocks, g3items = { };
|
encountertypelist, gamelanguages, balllist, gamelist, pokeblocks, g3items = { };
|
||||||
|
public static string[] metRSEFRLG_00000 = { };
|
||||||
public static string[] metHGSS_00000, metHGSS_02000, metHGSS_03000 = { };
|
public static string[] metHGSS_00000, metHGSS_02000, metHGSS_03000 = { };
|
||||||
public static string[] metBW2_00000, metBW2_30000, metBW2_40000, metBW2_60000 = { };
|
public static string[] metBW2_00000, metBW2_30000, metBW2_40000, metBW2_60000 = { };
|
||||||
public static string[] metXY_00000, metXY_30000, metXY_40000, metXY_60000 = { };
|
public static string[] metXY_00000, metXY_30000, metXY_40000, metXY_60000 = { };
|
||||||
|
@ -866,6 +867,7 @@ namespace PKHeX
|
||||||
|
|
||||||
// Past Generation strings
|
// Past Generation strings
|
||||||
g3items = Util.getStringList("ItemsG3", "en");
|
g3items = Util.getStringList("ItemsG3", "en");
|
||||||
|
metRSEFRLG_00000 = Util.getStringList("rsefrlg_00000", "en");
|
||||||
|
|
||||||
// Current Generation strings
|
// Current Generation strings
|
||||||
string l = curlanguage;
|
string l = curlanguage;
|
||||||
|
@ -1763,8 +1765,18 @@ namespace PKHeX
|
||||||
private void updateOriginGame(object sender, EventArgs e)
|
private void updateOriginGame(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
int Version = Util.getIndex(CB_GameOrigin);
|
int Version = Util.getIndex(CB_GameOrigin);
|
||||||
|
|
||||||
if (Version < 24 && origintrack != "Past" && SAV.Generation != 4)
|
if (SAV.Generation == 3 && origintrack != "Gen3")
|
||||||
|
{
|
||||||
|
var met_list = Util.getCBList(metRSEFRLG_00000, Enumerable.Range(0, 213).ToArray());
|
||||||
|
met_list = Util.getOffsetCBList(met_list, metRSEFRLG_00000, 00000, new[] {254, 255});
|
||||||
|
origintrack = "Gen3";
|
||||||
|
CB_MetLocation.DisplayMember = "Text";
|
||||||
|
CB_MetLocation.ValueMember = "Value";
|
||||||
|
CB_MetLocation.DataSource = met_list;
|
||||||
|
CB_MetLocation.SelectedValue = 0;
|
||||||
|
}
|
||||||
|
else if (Version < 24 && origintrack != "Past" && SAV.Generation >= 4)
|
||||||
{
|
{
|
||||||
// Load Past Gen Locations
|
// Load Past Gen Locations
|
||||||
#region B2W2 Met Locations
|
#region B2W2 Met Locations
|
||||||
|
@ -1830,7 +1842,7 @@ namespace PKHeX
|
||||||
origintrack = "Gen4";
|
origintrack = "Gen4";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Version < 0x10 && origintrack != "Gen4")
|
if (SAV.Generation > 3 && Version < 0x10 && origintrack != "Gen4")
|
||||||
{
|
{
|
||||||
// Load Gen 4 egg locations if Gen 4 Origin.
|
// Load Gen 4 egg locations if Gen 4 Origin.
|
||||||
#region HGSS Met Locations
|
#region HGSS Met Locations
|
||||||
|
@ -1851,10 +1863,13 @@ namespace PKHeX
|
||||||
}
|
}
|
||||||
|
|
||||||
// Visibility logic for Gen 4 encounter type; only show for Gen 4 Pokemon.
|
// Visibility logic for Gen 4 encounter type; only show for Gen 4 Pokemon.
|
||||||
bool g4 = Version >= 7 && Version <= 12 && Version != 9;
|
if (SAV.Generation >= 4)
|
||||||
CB_EncounterType.Visible = Label_EncounterType.Visible = g4;
|
{
|
||||||
if (!g4)
|
bool g4 = Version >= 7 && Version <= 12 && Version != 9;
|
||||||
CB_EncounterType.SelectedValue = 0;
|
CB_EncounterType.Visible = Label_EncounterType.Visible = g4;
|
||||||
|
if (!g4)
|
||||||
|
CB_EncounterType.SelectedValue = 0;
|
||||||
|
}
|
||||||
|
|
||||||
setMarkings(); // Set/Remove KB marking
|
setMarkings(); // Set/Remove KB marking
|
||||||
if (!fieldsLoaded)
|
if (!fieldsLoaded)
|
||||||
|
|
|
@ -571,6 +571,7 @@
|
||||||
<None Include="Resources\text\fr\text_tradeao_fr.txt" />
|
<None Include="Resources\text\fr\text_tradeao_fr.txt" />
|
||||||
<None Include="Resources\text\fr\text_tradexy_fr.txt" />
|
<None Include="Resources\text\fr\text_tradexy_fr.txt" />
|
||||||
<None Include="Resources\text\gen3\text_ItemsG3_en.txt" />
|
<None Include="Resources\text\gen3\text_ItemsG3_en.txt" />
|
||||||
|
<None Include="Resources\text\gen3\text_rsefrlg_00000_en.txt" />
|
||||||
<Content Include="Resources\text\it\text_Pokeblock_it.txt" />
|
<Content Include="Resources\text\it\text_Pokeblock_it.txt" />
|
||||||
<None Include="Resources\text\it\text_tradeao_it.txt" />
|
<None Include="Resources\text\it\text_tradeao_it.txt" />
|
||||||
<None Include="Resources\text\it\text_tradexy_it.txt" />
|
<None Include="Resources\text\it\text_tradexy_it.txt" />
|
||||||
|
|
52
Properties/Resources.Designer.cs
generated
52
Properties/Resources.Designer.cs
generated
|
@ -25686,6 +25686,58 @@ namespace PKHeX.Properties {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized string similar to Littleroot Town
|
||||||
|
///Oldale Town
|
||||||
|
///Dewford Town
|
||||||
|
///Lavaridge Town
|
||||||
|
///Fallarbor Town
|
||||||
|
///Verdanturf Town
|
||||||
|
///Pacifidlog Town
|
||||||
|
///Petalburg City
|
||||||
|
///Slateport City
|
||||||
|
///Mauville City
|
||||||
|
///Rustboro City
|
||||||
|
///Fortree City
|
||||||
|
///Lilycove City
|
||||||
|
///Mossdeep City
|
||||||
|
///Sootopolis City
|
||||||
|
///Ever Grande City
|
||||||
|
///Route 101
|
||||||
|
///Route 102
|
||||||
|
///Route 103
|
||||||
|
///Route 104
|
||||||
|
///Route 105
|
||||||
|
///Route 106
|
||||||
|
///Route 107
|
||||||
|
///Route 108
|
||||||
|
///Route 109
|
||||||
|
///Route 110
|
||||||
|
///Route 111
|
||||||
|
///Route 112
|
||||||
|
///Route 113
|
||||||
|
///Route 114
|
||||||
|
///Route 115
|
||||||
|
///Route 116
|
||||||
|
///Route 117
|
||||||
|
///Route 118
|
||||||
|
///Route 119
|
||||||
|
///Route 120
|
||||||
|
///Route 121
|
||||||
|
///Route 122
|
||||||
|
///Route 123
|
||||||
|
///Route 124
|
||||||
|
///Route 125
|
||||||
|
///Route 126
|
||||||
|
///Route 127
|
||||||
|
///Route 1 [rest of string was truncated]";.
|
||||||
|
/// </summary>
|
||||||
|
internal static string text_rsefrlg_00000_en {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("text_rsefrlg_00000_en", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized string similar to Ei
|
/// Looks up a localized string similar to Ei
|
||||||
///Bisasam
|
///Bisasam
|
||||||
|
|
|
@ -6043,4 +6043,7 @@
|
||||||
<data name="ribbonwinning" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="ribbonwinning" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\img\ribbons\ribbonwinning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\img\ribbons\ribbonwinning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="text_rsefrlg_00000_en" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\Resources\text\gen3\text_rsefrlg_00000_en.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
BIN
Resources/text/gen3/text_rsefrlg_00000_en.txt
Normal file
BIN
Resources/text/gen3/text_rsefrlg_00000_en.txt
Normal file
Binary file not shown.
Loading…
Reference in a new issue