diff --git a/PKHeX.Core/Game/GameStrings/FilteredGameDataSource.cs b/PKHeX.Core/Game/GameStrings/FilteredGameDataSource.cs index 8e8bf8bf9..3252fa2fa 100644 --- a/PKHeX.Core/Game/GameStrings/FilteredGameDataSource.cs +++ b/PKHeX.Core/Game/GameStrings/FilteredGameDataSource.cs @@ -32,7 +32,7 @@ public FilteredGameDataSource(SaveFile sav, GameDataSource source, bool HaX = fa Balls = Source.BallDataSource.Where(b => b.Value <= sav.MaxBallID).ToList(); Abilities = Source.AbilityDataSource.Where(a => a.Value <= sav.MaxAbilityID).ToList(); - G4EncounterTypes = Source.EncounterTypeDataSource; + G4GroundTiles = Source.GroundTileDataSource; Natures = Source.NatureDataSource; } @@ -73,7 +73,7 @@ private static IEnumerable GetFilteredMoves(IGameValueLimit sav, Game public readonly IReadOnlyList Languages; public readonly IReadOnlyList Abilities; public readonly IReadOnlyList Natures; - public readonly IReadOnlyList G4EncounterTypes; + public readonly IReadOnlyList G4GroundTiles; public readonly IReadOnlyList ConsoleRegions = GameDataSource.Regions; public IReadOnlyList GetAbilityList(PKM pkm) diff --git a/PKHeX.Core/Game/GameStrings/GameDataSource.cs b/PKHeX.Core/Game/GameStrings/GameDataSource.cs index 701c1df3c..07414540c 100644 --- a/PKHeX.Core/Game/GameStrings/GameDataSource.cs +++ b/PKHeX.Core/Game/GameStrings/GameDataSource.cs @@ -34,7 +34,6 @@ public sealed class GameDataSource // ignores Poke/Great/Ultra private static readonly ushort[] ball_nums = { 007, 576, 013, 492, 497, 014, 495, 493, 496, 494, 011, 498, 008, 006, 012, 015, 009, 005, 499, 010, 001, 016, 851 }; private static readonly byte[] ball_vals = { 007, 025, 013, 017, 022, 014, 020, 018, 021, 019, 011, 023, 008, 006, 012, 015, 009, 005, 024, 010, 001, 016, 026 }; - private static readonly byte[] Gen4EncounterTypes = { 0, 1, 2, 4, 5, 7, 9, 10, 12, 23, 24 }; public GameDataSource(GameStrings s) { @@ -43,7 +42,7 @@ public GameDataSource(GameStrings s) SpeciesDataSource = Util.GetCBList(s.specieslist); NatureDataSource = Util.GetCBList(s.natures); AbilityDataSource = Util.GetCBList(s.abilitylist); - EncounterTypeDataSource = Util.GetUnsortedCBList(s.encountertypelist, Gen4EncounterTypes); + GroundTileDataSource = Util.GetUnsortedCBList(s.groundtiletypes, GroundTileTypeExtensions.ValidTileTypes); var moves = Util.GetCBList(s.movelist); HaXMoveDataSource = moves; @@ -74,7 +73,7 @@ public GameDataSource(GameStrings s) public readonly IReadOnlyList VersionDataSource; public readonly IReadOnlyList LegalMoveDataSource; public readonly IReadOnlyList HaXMoveDataSource; - public readonly IReadOnlyList EncounterTypeDataSource; + public readonly IReadOnlyList GroundTileDataSource; private static IReadOnlyList GetVersionList(GameStrings s) { diff --git a/PKHeX.Core/Game/GameStrings/GameInfo.cs b/PKHeX.Core/Game/GameStrings/GameInfo.cs index 4f0aa45d4..775897361 100644 --- a/PKHeX.Core/Game/GameStrings/GameInfo.cs +++ b/PKHeX.Core/Game/GameStrings/GameInfo.cs @@ -49,7 +49,7 @@ public static string GetVersionName(GameVersion version) public static IReadOnlyList AbilityDataSource => Sources.AbilityDataSource; public static IReadOnlyList VersionDataSource => Sources.VersionDataSource; public static IReadOnlyList MoveDataSource => Sources.HaXMoveDataSource; - public static IReadOnlyList EncounterTypeDataSource => Sources.EncounterTypeDataSource; + public static IReadOnlyList GroundTileDataSource => Sources.GroundTileDataSource; public static IReadOnlyList Regions => GameDataSource.Regions; public static IReadOnlyList LanguageDataSource(int gen) => GameDataSource.LanguageDataSource(gen); diff --git a/PKHeX.Core/Game/GameStrings/GameStrings.cs b/PKHeX.Core/Game/GameStrings/GameStrings.cs index 9db25c29e..7cb8485a6 100644 --- a/PKHeX.Core/Game/GameStrings/GameStrings.cs +++ b/PKHeX.Core/Game/GameStrings/GameStrings.cs @@ -11,7 +11,7 @@ public sealed class GameStrings : IBasicStrings // PKM Info public readonly string[] specieslist, movelist, itemlist, abilitylist, types, natures, forms, memories, genloc, trainingbags, trainingstage, characteristics, - encountertypelist, balllist, gamelist, pokeblocks, ribbons; + groundtiletypes, balllist, gamelist, pokeblocks, ribbons; private readonly string[] g4items, g3coloitems, g3xditems, g3items, g2items, g1items; @@ -84,7 +84,7 @@ public GameStrings(string l) characteristics = Get("character"); specieslist = Get("species"); wallpapernames = Get("wallpaper"); - encountertypelist = Get("encountertype"); + groundtiletypes = Get("groundtile"); gamelist = Get("games"); balllist = new string[Items_Ball.Length]; diff --git a/PKHeX.Core/PKM/Shared/GroundTileType.cs b/PKHeX.Core/PKM/Shared/GroundTileType.cs index cf8d83cab..f3ef4af60 100644 --- a/PKHeX.Core/PKM/Shared/GroundTileType.cs +++ b/PKHeX.Core/PKM/Shared/GroundTileType.cs @@ -1,4 +1,6 @@ -namespace PKHeX.Core +using static PKHeX.Core.GroundTileType; + +namespace PKHeX.Core { /// /// Ground Tile Type the was encountered from. @@ -43,5 +45,10 @@ public enum GroundTileType : byte public static class GroundTileTypeExtensions { public static bool IsObtainable(this GroundTileType type) => ((0b_1_10000000_00010110_10110111 >> (int) type) & 1) == 1; + + public static readonly byte[] ValidTileTypes = + { + (byte)None, (byte)Sand, (byte)Grass, (byte)Rock, (byte)Cave, (byte)Water, (byte)Building, (byte)Marsh, (byte)Max_DP, (byte)Distortion, (byte)Max_Pt + }; } } diff --git a/PKHeX.Core/PKM/Util/PKMConverter.cs b/PKHeX.Core/PKM/Util/PKMConverter.cs index f51b9f20a..dfd79f1b1 100644 --- a/PKHeX.Core/PKM/Util/PKMConverter.cs +++ b/PKHeX.Core/PKM/Util/PKMConverter.cs @@ -167,9 +167,9 @@ private static bool IsPK6FormatReallyPK7(PK6 pk, int preferredFormat) if (pk.CurrentLevel < 100) // can't be hyper trained return false; - if (!pk.Gen4) // can't have encounter type + if (!pk.Gen4) // can't have GroundTile return true; - if (et > GroundTileType.Max_Pt) // invalid gen4 EncounterType + if (et > GroundTileType.Max_Pt) // invalid gen4 GroundTile return true; } diff --git a/PKHeX.Core/Resources/text/de/text_EncounterType_de.txt b/PKHeX.Core/Resources/text/de/text_GroundTile_de.txt similarity index 100% rename from PKHeX.Core/Resources/text/de/text_EncounterType_de.txt rename to PKHeX.Core/Resources/text/de/text_GroundTile_de.txt diff --git a/PKHeX.Core/Resources/text/en/text_EncounterType_en.txt b/PKHeX.Core/Resources/text/en/text_EncounterType_en.txt deleted file mode 100644 index 99492d953..000000000 --- a/PKHeX.Core/Resources/text/en/text_EncounterType_en.txt +++ /dev/null @@ -1,25 +0,0 @@ -None -Rock Smash (HGSS) -Tall Grass - -Dialga/Palkia -Cave/Hall of Origin - -Surfing/Fishing - -Building/Enigma Stone -Marsh/Safari - -Starter/Fossil/Gift (DP) - - - - - - - - - - -Distortion World (Pt) -Starter/Fossil/Gift (Pt/DP Trio) \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/en/text_GroundTile_en.txt b/PKHeX.Core/Resources/text/en/text_GroundTile_en.txt new file mode 100644 index 000000000..58e76b313 --- /dev/null +++ b/PKHeX.Core/Resources/text/en/text_GroundTile_en.txt @@ -0,0 +1,25 @@ +None +Sand +Grass + +Rock +Cave + +Water + +Building +Marsh + +Unspecific (DP) + + + + + + + + + + +Distortion World +Unspecific (Pt/HGSS) \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/es/text_EncounterType_es.txt b/PKHeX.Core/Resources/text/es/text_GroundTile_es.txt similarity index 100% rename from PKHeX.Core/Resources/text/es/text_EncounterType_es.txt rename to PKHeX.Core/Resources/text/es/text_GroundTile_es.txt diff --git a/PKHeX.Core/Resources/text/fr/text_EncounterType_fr.txt b/PKHeX.Core/Resources/text/fr/text_GroundTile_fr.txt similarity index 100% rename from PKHeX.Core/Resources/text/fr/text_EncounterType_fr.txt rename to PKHeX.Core/Resources/text/fr/text_GroundTile_fr.txt diff --git a/PKHeX.Core/Resources/text/it/text_EncounterType_it.txt b/PKHeX.Core/Resources/text/it/text_EncounterType_it.txt deleted file mode 100644 index 99492d953..000000000 --- a/PKHeX.Core/Resources/text/it/text_EncounterType_it.txt +++ /dev/null @@ -1,25 +0,0 @@ -None -Rock Smash (HGSS) -Tall Grass - -Dialga/Palkia -Cave/Hall of Origin - -Surfing/Fishing - -Building/Enigma Stone -Marsh/Safari - -Starter/Fossil/Gift (DP) - - - - - - - - - - -Distortion World (Pt) -Starter/Fossil/Gift (Pt/DP Trio) \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/it/text_GroundTile_it.txt b/PKHeX.Core/Resources/text/it/text_GroundTile_it.txt new file mode 100644 index 000000000..58e76b313 --- /dev/null +++ b/PKHeX.Core/Resources/text/it/text_GroundTile_it.txt @@ -0,0 +1,25 @@ +None +Sand +Grass + +Rock +Cave + +Water + +Building +Marsh + +Unspecific (DP) + + + + + + + + + + +Distortion World +Unspecific (Pt/HGSS) \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ja/text_EncounterType_ja.txt b/PKHeX.Core/Resources/text/ja/text_GroundTile_ja.txt similarity index 81% rename from PKHeX.Core/Resources/text/ja/text_EncounterType_ja.txt rename to PKHeX.Core/Resources/text/ja/text_GroundTile_ja.txt index bb47ab4e2..349978854 100644 --- a/PKHeX.Core/Resources/text/ja/text_EncounterType_ja.txt +++ b/PKHeX.Core/Resources/text/ja/text_GroundTile_ja.txt @@ -1,25 +1,25 @@ -指定なし -いわくだき (HGSS) -草むら - -ディアルガ / パルキア -洞窟 / はじまりのま - -なみのり / 釣り - -建物 / なぞのすいしょう -サファリ / 大湿原 - -御三家 / 化石 / ギフト (DP) - - - - - - - - - - -やぶれたせかい (Pt) +指定なし +いわくだき (HGSS) +草むら + +ディアルガ / パルキア +洞窟 / はじまりのま + +なみのり / 釣り + +建物 / なぞのすいしょう +サファリ / 大湿原 + +御三家 / 化石 / ギフト (DP) + + + + + + + + + + +やぶれたせかい (Pt) 御三家 / 化石 / ギフト (Pt/DP) \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ko/text_EncounterType_ko.txt b/PKHeX.Core/Resources/text/ko/text_GroundTile_ko.txt similarity index 100% rename from PKHeX.Core/Resources/text/ko/text_EncounterType_ko.txt rename to PKHeX.Core/Resources/text/ko/text_GroundTile_ko.txt diff --git a/PKHeX.Core/Resources/text/zh/text_EncounterType_zh.txt b/PKHeX.Core/Resources/text/zh/text_GroundTile_zh.txt similarity index 100% rename from PKHeX.Core/Resources/text/zh/text_EncounterType_zh.txt rename to PKHeX.Core/Resources/text/zh/text_GroundTile_zh.txt diff --git a/PKHeX.WinForms/Controls/PKM Editor/EditPK4.cs b/PKHeX.WinForms/Controls/PKM Editor/EditPK4.cs index c4c18490e..ffb78e741 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/EditPK4.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/EditPK4.cs @@ -15,8 +15,8 @@ private void PopulateFieldsPK4() LoadMisc3(pk4); LoadMisc4(pk4); - CB_EncounterType.SelectedValue = pk4.Gen4 ? (int)pk4.GroundTile : 0; - CB_EncounterType.Visible = Label_EncounterType.Visible = Entity.Gen4; + CB_GroundTile.SelectedValue = pk4.Gen4 ? (int)pk4.GroundTile : 0; + CB_GroundTile.Visible = Label_GroundTile.Visible = Entity.Gen4; if (HaX) DEV_Ability.SelectedValue = pk4.Ability; @@ -40,7 +40,7 @@ private G4PKM PreparePK4() SaveMisc3(pk4); SaveMisc4(pk4); - pk4.GroundTile = (GroundTileType)WinFormsUtil.GetIndex(CB_EncounterType); + pk4.GroundTile = (GroundTileType)WinFormsUtil.GetIndex(CB_GroundTile); // Minor properties pk4.ShinyLeaf = ShinyLeaf.GetValue(); diff --git a/PKHeX.WinForms/Controls/PKM Editor/EditPK5.cs b/PKHeX.WinForms/Controls/PKM Editor/EditPK5.cs index b345d6ed1..46c404de5 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/EditPK5.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/EditPK5.cs @@ -14,8 +14,8 @@ private void PopulateFieldsPK5() LoadMisc2(pk5); LoadMisc3(pk5); LoadMisc4(pk5); - CB_EncounterType.SelectedValue = pk5.Gen4 ? (int)pk5.GroundTile : 0; - CB_EncounterType.Visible = Label_EncounterType.Visible = pk5.Gen4; + CB_GroundTile.SelectedValue = pk5.Gen4 ? (int)pk5.GroundTile : 0; + CB_GroundTile.Visible = Label_GroundTile.Visible = pk5.Gen4; CHK_NSparkle.Checked = pk5.NPokémon; if (HaX) @@ -39,7 +39,7 @@ private PK5 PreparePK5() SaveMisc3(pk5); SaveMisc4(pk5); - pk5.GroundTile = (GroundTileType)WinFormsUtil.GetIndex(CB_EncounterType); + pk5.GroundTile = (GroundTileType)WinFormsUtil.GetIndex(CB_GroundTile); pk5.NPokémon = CHK_NSparkle.Checked; if (!HaX) // specify via extra 0x42 instead pk5.HiddenAbility = CB_Ability.SelectedIndex > 1; // not 0 or 1 diff --git a/PKHeX.WinForms/Controls/PKM Editor/EditPK6.cs b/PKHeX.WinForms/Controls/PKM Editor/EditPK6.cs index cfe4be51f..a484c0c28 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/EditPK6.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/EditPK6.cs @@ -16,8 +16,8 @@ private void PopulateFieldsPK6() LoadMisc4(pk6); LoadMisc6(pk6); - CB_EncounterType.SelectedValue = pk6.Gen4 ? (int)pk6.GroundTile : 0; - CB_EncounterType.Visible = Label_EncounterType.Visible = pk6.Gen4; + CB_GroundTile.SelectedValue = pk6.Gen4 ? (int)pk6.GroundTile : 0; + CB_GroundTile.Visible = Label_GroundTile.Visible = pk6.Gen4; LoadPartyStats(pk6); UpdateStats(); @@ -35,7 +35,7 @@ private PK6 PreparePK6() SaveMisc6(pk6); CheckTransferPIDValid(pk6); - pk6.GroundTile = (GroundTileType)WinFormsUtil.GetIndex(CB_EncounterType); + pk6.GroundTile = (GroundTileType)WinFormsUtil.GetIndex(CB_GroundTile); // Toss in Party Stats SavePartyStats(pk6); diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs index aed394580..4b9cf5055 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs @@ -159,9 +159,9 @@ private void InitializeComponent() this.FLP_Fateful = new System.Windows.Forms.FlowLayoutPanel(); this.PAN_Fateful = new System.Windows.Forms.Panel(); this.CHK_Fateful = new System.Windows.Forms.CheckBox(); - this.FLP_EncounterType = new System.Windows.Forms.FlowLayoutPanel(); - this.Label_EncounterType = new System.Windows.Forms.Label(); - this.CB_EncounterType = new System.Windows.Forms.ComboBox(); + this.FLP_GroundTile = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_GroundTile = new System.Windows.Forms.Label(); + this.CB_GroundTile = new System.Windows.Forms.ComboBox(); this.FLP_TimeOfDay = new System.Windows.Forms.FlowLayoutPanel(); this.L_MetTimeOfDay = new System.Windows.Forms.Label(); this.CB_MetTimeOfDay = new System.Windows.Forms.ComboBox(); @@ -287,7 +287,7 @@ private void InitializeComponent() this.FLP_MetLevel.SuspendLayout(); this.FLP_MetDate.SuspendLayout(); this.FLP_Fateful.SuspendLayout(); - this.FLP_EncounterType.SuspendLayout(); + this.FLP_GroundTile.SuspendLayout(); this.FLP_TimeOfDay.SuspendLayout(); this.Tab_Stats.SuspendLayout(); this.Tab_Attacks.SuspendLayout(); @@ -1603,7 +1603,7 @@ private void InitializeComponent() this.FLP_Met.Controls.Add(this.FLP_MetLevel); this.FLP_Met.Controls.Add(this.FLP_MetDate); this.FLP_Met.Controls.Add(this.FLP_Fateful); - this.FLP_Met.Controls.Add(this.FLP_EncounterType); + this.FLP_Met.Controls.Add(this.FLP_GroundTile); this.FLP_Met.Controls.Add(this.FLP_TimeOfDay); this.FLP_Met.Location = new System.Drawing.Point(0, 24); this.FLP_Met.Name = "FLP_Met"; @@ -1869,37 +1869,37 @@ private void InitializeComponent() this.CHK_Fateful.Text = "Fateful Encounter"; this.CHK_Fateful.UseVisualStyleBackColor = true; // - // FLP_EncounterType + // FLP_GroundTile // - this.FLP_EncounterType.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.FLP_EncounterType.Controls.Add(this.Label_EncounterType); - this.FLP_EncounterType.Controls.Add(this.CB_EncounterType); - this.FLP_EncounterType.Location = new System.Drawing.Point(0, 147); - this.FLP_EncounterType.Margin = new System.Windows.Forms.Padding(0); - this.FLP_EncounterType.Name = "FLP_EncounterType"; - this.FLP_EncounterType.Size = new System.Drawing.Size(272, 21); - this.FLP_EncounterType.TabIndex = 6; + this.FLP_GroundTile.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_GroundTile.Controls.Add(this.Label_GroundTile); + this.FLP_GroundTile.Controls.Add(this.CB_GroundTile); + this.FLP_GroundTile.Location = new System.Drawing.Point(0, 147); + this.FLP_GroundTile.Margin = new System.Windows.Forms.Padding(0); + this.FLP_GroundTile.Name = "FLP_GroundTile"; + this.FLP_GroundTile.Size = new System.Drawing.Size(272, 21); + this.FLP_GroundTile.TabIndex = 6; // - // Label_EncounterType + // Label_GroundTile // - this.Label_EncounterType.Location = new System.Drawing.Point(0, 0); - this.Label_EncounterType.Margin = new System.Windows.Forms.Padding(0); - this.Label_EncounterType.Name = "Label_EncounterType"; - this.Label_EncounterType.Size = new System.Drawing.Size(110, 21); - this.Label_EncounterType.TabIndex = 5; - this.Label_EncounterType.Text = "Encounter:"; - this.Label_EncounterType.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_GroundTile.Location = new System.Drawing.Point(0, 0); + this.Label_GroundTile.Margin = new System.Windows.Forms.Padding(0); + this.Label_GroundTile.Name = "Label_GroundTile"; + this.Label_GroundTile.Size = new System.Drawing.Size(110, 21); + this.Label_GroundTile.TabIndex = 5; + this.Label_GroundTile.Text = "Encounter:"; + this.Label_GroundTile.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // CB_EncounterType + // CB_GroundTile // - this.CB_EncounterType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CB_EncounterType.DropDownWidth = 160; - this.CB_EncounterType.FormattingEnabled = true; - this.CB_EncounterType.Location = new System.Drawing.Point(110, 0); - this.CB_EncounterType.Margin = new System.Windows.Forms.Padding(0); - this.CB_EncounterType.Name = "CB_EncounterType"; - this.CB_EncounterType.Size = new System.Drawing.Size(126, 21); - this.CB_EncounterType.TabIndex = 7; + this.CB_GroundTile.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CB_GroundTile.DropDownWidth = 160; + this.CB_GroundTile.FormattingEnabled = true; + this.CB_GroundTile.Location = new System.Drawing.Point(110, 0); + this.CB_GroundTile.Margin = new System.Windows.Forms.Padding(0); + this.CB_GroundTile.Name = "CB_GroundTile"; + this.CB_GroundTile.Size = new System.Drawing.Size(126, 21); + this.CB_GroundTile.TabIndex = 7; // // FLP_TimeOfDay // @@ -2856,7 +2856,7 @@ private void InitializeComponent() this.FLP_MetDate.ResumeLayout(false); this.FLP_Fateful.ResumeLayout(false); this.FLP_Fateful.PerformLayout(); - this.FLP_EncounterType.ResumeLayout(false); + this.FLP_GroundTile.ResumeLayout(false); this.FLP_TimeOfDay.ResumeLayout(false); this.Tab_Stats.ResumeLayout(false); this.Tab_Attacks.ResumeLayout(false); @@ -3007,9 +3007,9 @@ private void InitializeComponent() private System.Windows.Forms.FlowLayoutPanel FLP_Fateful; private System.Windows.Forms.Panel PAN_Fateful; private System.Windows.Forms.CheckBox CHK_Fateful; - private System.Windows.Forms.FlowLayoutPanel FLP_EncounterType; - private System.Windows.Forms.Label Label_EncounterType; - private System.Windows.Forms.ComboBox CB_EncounterType; + private System.Windows.Forms.FlowLayoutPanel FLP_GroundTile; + private System.Windows.Forms.Label Label_GroundTile; + private System.Windows.Forms.ComboBox CB_GroundTile; private System.Windows.Forms.FlowLayoutPanel FLP_TimeOfDay; private System.Windows.Forms.Label L_MetTimeOfDay; private System.Windows.Forms.ComboBox CB_MetTimeOfDay; diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs index 304dab190..155a6caa1 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs @@ -59,7 +59,7 @@ public void InitializeBinding() { CB_Nature, CB_StatNature, CB_Country, CB_SubRegion, CB_3DSReg, CB_Language, CB_Ball, CB_HeldItem, CB_Species, DEV_Ability, - CB_EncounterType, CB_GameOrigin, CB_BattleVersion, CB_Ability, CB_MetLocation, CB_EggLocation, CB_Language, CB_HTLanguage, + CB_GroundTile, CB_GameOrigin, CB_BattleVersion, CB_Ability, CB_MetLocation, CB_EggLocation, CB_Language, CB_HTLanguage, }; foreach (var cb in cbs.Concat(Moves.Concat(Relearn))) cb.InitializeBinding(); @@ -798,7 +798,7 @@ private bool SetSuggestedMetLocation(bool silent = false) if (Entity.CurrentLevel >= minlvl && Entity.Met_Level == level && Entity.Met_Location == location) { - if (!encounter.HasGroundTile(Entity.Format) || WinFormsUtil.GetIndex(CB_EncounterType) == (int)encounter.GetSuggestedGroundTile()) + if (!encounter.HasGroundTile(Entity.Format) || WinFormsUtil.GetIndex(CB_GroundTile) == (int)encounter.GetSuggestedGroundTile()) return false; } if (minlvl < level) @@ -822,7 +822,7 @@ private bool SetSuggestedMetLocation(bool silent = false) CB_MetLocation.SelectedValue = location; if (encounter.HasGroundTile(Entity.Format)) - CB_EncounterType.SelectedValue = (int)encounter.GetSuggestedGroundTile(); + CB_GroundTile.SelectedValue = (int)encounter.GetSuggestedGroundTile(); if (Entity.Gen6 && Entity.WasEgg && ModifyPKM) Entity.SetHatchMemory6(); @@ -1199,13 +1199,13 @@ private void UpdateOriginGame(object sender, EventArgs e) Entity.Version = (int)version; } - // Visibility logic for Gen 4 encounter type; only show for Gen 4 Pokemon. + // Visibility logic for Gen 4 ground tile; only show for Gen 4 Pokemon. if (Entity is IGroundTile) { bool g4 = Entity.Gen4; - CB_EncounterType.Visible = Label_EncounterType.Visible = g4 && Entity.Format < 7; + CB_GroundTile.Visible = Label_GroundTile.Visible = g4 && Entity.Format < 7; if (!g4) - CB_EncounterType.SelectedValue = 0; + CB_GroundTile.SelectedValue = 0; } if (!FieldsLoaded) @@ -1826,7 +1826,7 @@ private void ToggleInterface(int gen) FLP_MetDate.Visible = gen >= 4; FLP_Fateful.Visible = FLP_Ball.Visible = FLP_OriginGame.Visible = gen >= 3; FLP_MetLocation.Visible = FLP_MetLevel.Visible = gen >= 2; - FLP_EncounterType.Visible = gen is 4 or 5 or 6; + FLP_GroundTile.Visible = gen is 4 or 5 or 6; FLP_TimeOfDay.Visible = gen == 2; Contest.ToggleInterface(Entity, gen); @@ -1951,7 +1951,7 @@ private void InitializeLanguage(ITrainerInfo sav) SetCountrySubRegion(CB_Country, "countries"); CB_3DSReg.DataSource = source.ConsoleRegions; - CB_EncounterType.DataSource = new BindingSource(source.G4EncounterTypes, null); + CB_GroundTile.DataSource = new BindingSource(source.G4GroundTiles, null); CB_Nature.DataSource = new BindingSource(source.Natures, null); CB_StatNature.DataSource = new BindingSource(source.Natures, null); diff --git a/PKHeX.WinForms/Resources/text/lang_de.txt b/PKHeX.WinForms/Resources/text/lang_de.txt index e019a2220..b43f6f025 100644 --- a/PKHeX.WinForms/Resources/text/lang_de.txt +++ b/PKHeX.WinForms/Resources/text/lang_de.txt @@ -232,7 +232,7 @@ Main.Label_Cute=Anmut Main.Label_DEF=Vert: Main.Label_EggDate=Datum: Main.Label_EggLocation=Fundort: -Main.Label_EncounterType=Begegnung: +Main.Label_GroundTile=Begegnung: Main.Label_EncryptionConstant=PKX-Konstante: Main.Label_EVs=EVs Main.Label_EXP=EP: diff --git a/PKHeX.WinForms/Resources/text/lang_en.txt b/PKHeX.WinForms/Resources/text/lang_en.txt index a372ad582..075547fba 100644 --- a/PKHeX.WinForms/Resources/text/lang_en.txt +++ b/PKHeX.WinForms/Resources/text/lang_en.txt @@ -232,7 +232,7 @@ Main.Label_Cute=Cute Main.Label_DEF=Def: Main.Label_EggDate=Date: Main.Label_EggLocation=Location: -Main.Label_EncounterType=Encounter: +Main.Label_GroundTile=Encountered On: Main.Label_EncryptionConstant=Encryption Constant: Main.Label_EVs=EVs Main.Label_EXP=EXP: diff --git a/PKHeX.WinForms/Resources/text/lang_es.txt b/PKHeX.WinForms/Resources/text/lang_es.txt index a0a1015b1..f55973222 100644 --- a/PKHeX.WinForms/Resources/text/lang_es.txt +++ b/PKHeX.WinForms/Resources/text/lang_es.txt @@ -232,7 +232,7 @@ Main.Label_Cute=Dulzura Main.Label_DEF=Defensa: Main.Label_EggDate=Fecha: Main.Label_EggLocation=Lugar: -Main.Label_EncounterType=Encuentro: +Main.Label_GroundTile=Encuentro: Main.Label_EncryptionConstant=Cte. de encriptación: Main.Label_EVs=EVs Main.Label_EXP=EXP: diff --git a/PKHeX.WinForms/Resources/text/lang_fr.txt b/PKHeX.WinForms/Resources/text/lang_fr.txt index 3494efda8..9cf82cae9 100644 --- a/PKHeX.WinForms/Resources/text/lang_fr.txt +++ b/PKHeX.WinForms/Resources/text/lang_fr.txt @@ -232,7 +232,7 @@ Main.Label_Cute=Grâce Main.Label_DEF=Défense : Main.Label_EggDate=Date : Main.Label_EggLocation=Lieu : -Main.Label_EncounterType=Zone : +Main.Label_GroundTile=Zone : Main.Label_EncryptionConstant=Valeur de cryptage : Main.Label_EVs=EV Main.Label_EXP=Expérience : diff --git a/PKHeX.WinForms/Resources/text/lang_it.txt b/PKHeX.WinForms/Resources/text/lang_it.txt index 82542f094..a2f7e3103 100644 --- a/PKHeX.WinForms/Resources/text/lang_it.txt +++ b/PKHeX.WinForms/Resources/text/lang_it.txt @@ -232,7 +232,7 @@ Main.Label_Cute=Cute Main.Label_DEF=Def: Main.Label_EggDate=Date: Main.Label_EggLocation=Location: -Main.Label_EncounterType=Encounter: +Main.Label_GroundTile=Encounter: Main.Label_EncryptionConstant=Encryption Constant: Main.Label_EVs=EVs Main.Label_EXP=EXP: diff --git a/PKHeX.WinForms/Resources/text/lang_ja.txt b/PKHeX.WinForms/Resources/text/lang_ja.txt index 7e91916a3..457cd1124 100644 --- a/PKHeX.WinForms/Resources/text/lang_ja.txt +++ b/PKHeX.WinForms/Resources/text/lang_ja.txt @@ -232,7 +232,7 @@ Main.Label_Cute=かわいさ Main.Label_DEF=防御 Main.Label_EggDate=貰った日 Main.Label_EggLocation=貰った場所 -Main.Label_EncounterType=出会いの種類 +Main.Label_GroundTile=出会いの種類 Main.Label_EncryptionConstant=暗号化定数 Main.Label_EVs=努力値 Main.Label_EXP=経験値 diff --git a/PKHeX.WinForms/Resources/text/lang_ko.txt b/PKHeX.WinForms/Resources/text/lang_ko.txt index 72c91f659..1ec2c3a6a 100644 --- a/PKHeX.WinForms/Resources/text/lang_ko.txt +++ b/PKHeX.WinForms/Resources/text/lang_ko.txt @@ -232,7 +232,7 @@ Main.Label_Cute=귀여움 Main.Label_DEF=방어: Main.Label_EggDate=날짜: Main.Label_EggLocation=장소: -Main.Label_EncounterType=인카운터: +Main.Label_GroundTile=인카운터: Main.Label_EncryptionConstant=암호화 상수: Main.Label_EVs=EVs Main.Label_EXP=경험치: diff --git a/PKHeX.WinForms/Resources/text/lang_zh.txt b/PKHeX.WinForms/Resources/text/lang_zh.txt index bbabacbc5..42bb8d846 100644 --- a/PKHeX.WinForms/Resources/text/lang_zh.txt +++ b/PKHeX.WinForms/Resources/text/lang_zh.txt @@ -232,7 +232,7 @@ Main.Label_Cute=可爱 Main.Label_DEF=防御: Main.Label_EggDate=孵化日期: Main.Label_EggLocation=取得场所: -Main.Label_EncounterType=相遇类型: +Main.Label_GroundTile=相遇类型: Main.Label_EncryptionConstant=加密常数 Main.Label_EVs=努力值 Main.Label_EXP=经验值: diff --git a/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 EncounterType/Rock Smash/074 - GEODUDE - B16E2318D744.pk4 b/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 GroundTile/Rock Smash/074 - GEODUDE - B16E2318D744.pk4 similarity index 100% rename from Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 EncounterType/Rock Smash/074 - GEODUDE - B16E2318D744.pk4 rename to Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 GroundTile/Rock Smash/074 - GEODUDE - B16E2318D744.pk4 diff --git a/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 EncounterType/Rock Smash/098 - KRABBY - 86943584D01B.pk4 b/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 GroundTile/Rock Smash/098 - KRABBY - 86943584D01B.pk4 similarity index 100% rename from Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 EncounterType/Rock Smash/098 - KRABBY - 86943584D01B.pk4 rename to Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 GroundTile/Rock Smash/098 - KRABBY - 86943584D01B.pk4 diff --git a/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 EncounterType/Rock Smash/098 - KRABBY - C589B4EFB45F.pk4 b/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 GroundTile/Rock Smash/098 - KRABBY - C589B4EFB45F.pk4 similarity index 100% rename from Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 EncounterType/Rock Smash/098 - KRABBY - C589B4EFB45F.pk4 rename to Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 GroundTile/Rock Smash/098 - KRABBY - C589B4EFB45F.pk4 diff --git a/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 EncounterType/Special Handling/104 ★ - CUBONE - ABE400000004.pk4 b/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 GroundTile/Special Handling/104 ★ - CUBONE - ABE400000004.pk4 similarity index 100% rename from Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 EncounterType/Special Handling/104 ★ - CUBONE - ABE400000004.pk4 rename to Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 GroundTile/Special Handling/104 ★ - CUBONE - ABE400000004.pk4 diff --git a/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 EncounterType/Special Handling/201 - UNOWN - E8FFA68025F9.pk4 b/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 GroundTile/Special Handling/201 - UNOWN - E8FFA68025F9.pk4 similarity index 100% rename from Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 EncounterType/Special Handling/201 - UNOWN - E8FFA68025F9.pk4 rename to Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 GroundTile/Special Handling/201 - UNOWN - E8FFA68025F9.pk4 diff --git a/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 EncounterType/Special Handling/215 - SNEASEL - 72E6A36A07BD.pk4 b/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 GroundTile/Special Handling/215 - SNEASEL - 72E6A36A07BD.pk4 similarity index 100% rename from Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 EncounterType/Special Handling/215 - SNEASEL - 72E6A36A07BD.pk4 rename to Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 GroundTile/Special Handling/215 - SNEASEL - 72E6A36A07BD.pk4 diff --git a/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 EncounterType/Special Handling/231 - PHANPY - 579744E8F948.pk4 b/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 GroundTile/Special Handling/231 - PHANPY - 579744E8F948.pk4 similarity index 100% rename from Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 EncounterType/Special Handling/231 - PHANPY - 579744E8F948.pk4 rename to Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 GroundTile/Special Handling/231 - PHANPY - 579744E8F948.pk4 diff --git a/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 EncounterType/Special Handling/246 - LARVITAR - 2AC20000000E.pk4 b/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 GroundTile/Special Handling/246 - LARVITAR - 2AC20000000E.pk4 similarity index 100% rename from Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 EncounterType/Special Handling/246 - LARVITAR - 2AC20000000E.pk4 rename to Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 GroundTile/Special Handling/246 - LARVITAR - 2AC20000000E.pk4 diff --git a/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 EncounterType/Special Handling/246 ★ - LARVITAR - E4CF00000002.pk4 b/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 GroundTile/Special Handling/246 ★ - LARVITAR - E4CF00000002.pk4 similarity index 100% rename from Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 EncounterType/Special Handling/246 ★ - LARVITAR - E4CF00000002.pk4 rename to Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 GroundTile/Special Handling/246 ★ - LARVITAR - E4CF00000002.pk4 diff --git a/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 EncounterType/Special Handling/308 - MEDICHAM - 25F8A56FA3F2.pk4 b/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 GroundTile/Special Handling/308 - MEDICHAM - 25F8A56FA3F2.pk4 similarity index 100% rename from Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 EncounterType/Special Handling/308 - MEDICHAM - 25F8A56FA3F2.pk4 rename to Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 GroundTile/Special Handling/308 - MEDICHAM - 25F8A56FA3F2.pk4 diff --git a/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 EncounterType/Special Handling/477 - DUSKNOIR - 12DF9E28828D.pk4 b/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 GroundTile/Special Handling/477 - DUSKNOIR - 12DF9E28828D.pk4 similarity index 100% rename from Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 EncounterType/Special Handling/477 - DUSKNOIR - 12DF9E28828D.pk4 rename to Tests/PKHeX.Core.Tests/Legality/Legal/Generation 4 GroundTile/Special Handling/477 - DUSKNOIR - 12DF9E28828D.pk4