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

Include swsh held items to valid items list

Browse source 
Closes #2518
This commit is contained in:
Kurt 2019-11-24 22:34:51 -08:00
parent c446ff5b51
commit 0dcd9b744a
4 changed files with 15 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
PKHeX.Core/Game/GameStrings/GameDataSource.cs
View file

@ -41,13 +41,10 @@ namespace PKHeX.Core
MetGen7GG = CreateGen7GG(s); MetGen7GG = CreateGen7GG(s);
MetGen8 = CreateGen8(s); MetGen8 = CreateGen8(s);
Memories = new MemoryStrings(s);
Empty = new ComboItem(s.Species[0], 0); Empty = new ComboItem(s.Species[0], 0);
} }
public readonly GameStrings Source; public readonly GameStrings Source;
public readonly MemoryStrings Memories;
public readonly IReadOnlyList<ComboItem> SpeciesDataSource; public readonly IReadOnlyList<ComboItem> SpeciesDataSource;
public readonly IReadOnlyList<ComboItem> BallDataSource; public readonly IReadOnlyList<ComboItem> BallDataSource;

15
PKHeX.Core/Game/GameStrings/MemoryStrings.cs
View file

@ -8,18 +8,25 @@ namespace PKHeX.Core
{ {
private readonly GameStrings s; private readonly GameStrings s;
public MemoryStrings(GameStrings strings) public MemoryStrings(GameStrings strings, int format)
{ {
s = strings; s = strings;
memories = new Lazy<List<ComboItem>>(GetMemories); memories = new Lazy<List<ComboItem>>(GetMemories);
none = new Lazy<List<ComboItem>>(() => Util.GetCBList(new[] {string.Empty})); none = new Lazy<List<ComboItem>>(() => Util.GetCBList(new[] {string.Empty}));
species = new Lazy<List<ComboItem>>(() => Util.GetCBList(s.specieslist.ToArray())); species = new Lazy<List<ComboItem>>(() => Util.GetCBList(s.specieslist));
item = new Lazy<List<ComboItem>>(() => Util.GetCBList(s.itemlist, Memories.MemoryItems)); item = new Lazy<List<ComboItem>>(() => GetItems(format));
genloc = new Lazy<List<ComboItem>>(() => Util.GetCBList(s.genloc)); genloc = new Lazy<List<ComboItem>>(() => Util.GetCBList(s.genloc));
moves = new Lazy<List<ComboItem>>(() => Util.GetCBList(s.movelist.ToArray())); // Hyperspace Fury moves = new Lazy<List<ComboItem>>(() => Util.GetCBList(s.movelist)); // Hyperspace Fury
specific = new Lazy<List<ComboItem>>(() => Util.GetCBList(s.metXY_00000, Legal.Met_XY_0)); specific = new Lazy<List<ComboItem>>(() => Util.GetCBList(s.metXY_00000, Legal.Met_XY_0));
} }
private List<ComboItem> GetItems(int format)
{
var permit = format < 8 ? Legal.HeldItem_AO : Legal.HeldItem_AO.Concat(Legal.HeldItems_SWSH).Distinct();
var asInt = permit.Select(z => (int) z).ToArray();
return Util.GetCBList(s.itemlist, asInt);
}
private readonly Lazy<List<ComboItem>> memories; private readonly Lazy<List<ComboItem>> memories;
private readonly Lazy<List<ComboItem>> none, species, item, genloc, moves, specific; private readonly Lazy<List<ComboItem>> none, species, item, genloc, moves, specific;

21
PKHeX.Core/Legality/Memories.cs
View file

@ -8,27 +8,6 @@ namespace PKHeX.Core
public static class Memories public static class Memories
{ {
#region Tables #region Tables
internal static readonly int[] MemoryItems =
{
1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,
50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,
100,101,102,103,104,105,106,107,108,109,110,111,112,116,117,118,119,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,
150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,
200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,
250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,
300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,
350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386,387,388,389,390,391,392,393,394,395,396,397,398,399,
400,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,416,417,418,419,420,421,422,423,424,425,428,429,430,431,432,433,434,435,436,437,438,439,440,441,442,443,444,445,446,447,448,449,
450,451,452,453,454,455,456,457,458,459,460,461,462,463,464,465,466,467,468,469,470,471,472,473,474,475,476,477,478,479,480,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,
500,501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,540,541,542,543,544,545,546,547,548,549,
550,551,552,553,554,555,556,557,558,559,560,561,562,563,564,565,566,567,568,569,570,571,572,573,574,575,576,577,578,579,580,581,582,583,584,585,586,587,588,589,590,591,592,593,594,595,596,597,598,599,
600,601,602,603,604,605,606,607,608,609,610,611,612,613,614,615,616,617,618,619,620,621,623,624,625,626,627,628,629,630,631,632,633,634,635,636,637,638,639,640,641,642,643,644,645,646,647,648,649,
650,651,652,653,654,655,656,657,658,659,660,661,662,663,664,665,666,667,668,669,670,671,672,673,674,675,676,677,678,679,680,681,682,683,684,685,686,687,688,689,690,691,692,693,694,695,696,697,698,699,
700,701,702,703,704,705,706,707,708,709,710,711,712,713,714,715,716,717,
/* ORAS */
718,719,720,737,738,739,740,741,742,752,753,754,755,756,757,758,759,760,761,762,763,764,765,767,768, 769,770,775
};
internal static readonly int[] Memory_NotXY = internal static readonly int[] Memory_NotXY =
{ {
65, // {0} was with {1} when (he/she) built a Secret Base. {4} that {3}. 65, // {0} was with {1} when (he/she) built a Secret Base. {4} that {3}.

6
PKHeX.WinForms/Subforms/PKM Editors/MemoryAmie.cs
View file

@ -7,12 +7,14 @@ namespace PKHeX.WinForms
public partial class MemoryAmie : Form public partial class MemoryAmie : Form
{ {
private readonly TextMarkup TextArgs; private readonly TextMarkup TextArgs;
private readonly MemoryStrings MemStrings;
public MemoryAmie(PKM pk) public MemoryAmie(PKM pk)
{ {
InitializeComponent(); InitializeComponent();
WinFormsUtil.TranslateInterface(this, Main.CurrentLanguage); WinFormsUtil.TranslateInterface(this, Main.CurrentLanguage);
pkm = pk; pkm = pk;
MemStrings = new MemoryStrings(GameInfo.Strings, pkm.Format);
PrevCountries = new[] { CB_Country0, CB_Country1, CB_Country2, CB_Country3, CB_Country4 }; PrevCountries = new[] { CB_Country0, CB_Country1, CB_Country2, CB_Country3, CB_Country4 };
PrevRegions = new[] { CB_Region0, CB_Region1, CB_Region2, CB_Region3, CB_Region4, }; PrevRegions = new[] { CB_Region0, CB_Region1, CB_Region2, CB_Region3, CB_Region4, };
string[] arguments = L_Arguments.Text.Split(new[] {" ; "}, StringSplitOptions.None); string[] arguments = L_Arguments.Text.Split(new[] {" ; "}, StringSplitOptions.None);
@ -182,7 +184,7 @@ namespace PKHeX.WinForms
private void GetLangStrings() private void GetLangStrings()
{ {
var strings = GameInfo.FilteredSources.Source.Memories; var strings = MemStrings;
CB_OTMemory.InitializeBinding(); CB_OTMemory.InitializeBinding();
CB_CTMemory.InitializeBinding(); CB_CTMemory.InitializeBinding();
CB_OTMemory.DataSource = new BindingSource(strings.Memory, null); CB_OTMemory.DataSource = new BindingSource(strings.Memory, null);
@ -207,7 +209,7 @@ namespace PKHeX.WinForms
{ {
int memory = WinFormsUtil.GetIndex((ComboBox) sender); int memory = WinFormsUtil.GetIndex((ComboBox) sender);
var memIndex = Memories.GetMemoryArgType(memory); var memIndex = Memories.GetMemoryArgType(memory);
var argvals = GameInfo.Sources.Memories.GetArgumentStrings(memIndex); var argvals = MemStrings.GetArgumentStrings(memIndex);
if (sender == CB_CTMemory) if (sender == CB_CTMemory)
{ {
CB_CTVar.InitializeBinding(); CB_CTVar.InitializeBinding();