mirror of
https://github.com/kwsch/PKHeX.git
synced 2026-10-01 23:48:40 -05:00
Finish renaming EncounterType->GroundTile
Update the localization for GroundTile for english (and Italian, which is untranslated)
This commit is contained in:
@@ -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<ComboItem> GetFilteredMoves(IGameValueLimit sav, Game
|
||||
public readonly IReadOnlyList<ComboItem> Languages;
|
||||
public readonly IReadOnlyList<ComboItem> Abilities;
|
||||
public readonly IReadOnlyList<ComboItem> Natures;
|
||||
public readonly IReadOnlyList<ComboItem> G4EncounterTypes;
|
||||
public readonly IReadOnlyList<ComboItem> G4GroundTiles;
|
||||
public readonly IReadOnlyList<ComboItem> ConsoleRegions = GameDataSource.Regions;
|
||||
|
||||
public IReadOnlyList<ComboItem> GetAbilityList(PKM pkm)
|
||||
|
||||
@@ -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<ComboItem> VersionDataSource;
|
||||
public readonly IReadOnlyList<ComboItem> LegalMoveDataSource;
|
||||
public readonly IReadOnlyList<ComboItem> HaXMoveDataSource;
|
||||
public readonly IReadOnlyList<ComboItem> EncounterTypeDataSource;
|
||||
public readonly IReadOnlyList<ComboItem> GroundTileDataSource;
|
||||
|
||||
private static IReadOnlyList<ComboItem> GetVersionList(GameStrings s)
|
||||
{
|
||||
|
||||
@@ -49,7 +49,7 @@ public static string GetVersionName(GameVersion version)
|
||||
public static IReadOnlyList<ComboItem> AbilityDataSource => Sources.AbilityDataSource;
|
||||
public static IReadOnlyList<ComboItem> VersionDataSource => Sources.VersionDataSource;
|
||||
public static IReadOnlyList<ComboItem> MoveDataSource => Sources.HaXMoveDataSource;
|
||||
public static IReadOnlyList<ComboItem> EncounterTypeDataSource => Sources.EncounterTypeDataSource;
|
||||
public static IReadOnlyList<ComboItem> GroundTileDataSource => Sources.GroundTileDataSource;
|
||||
public static IReadOnlyList<ComboItem> Regions => GameDataSource.Regions;
|
||||
|
||||
public static IReadOnlyList<ComboItem> LanguageDataSource(int gen) => GameDataSource.LanguageDataSource(gen);
|
||||
|
||||
@@ -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];
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
namespace PKHeX.Core
|
||||
using static PKHeX.Core.GroundTileType;
|
||||
|
||||
namespace PKHeX.Core
|
||||
{
|
||||
/// <summary>
|
||||
/// Ground Tile Type the <see cref="PKM"/> 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
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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)
|
||||
25
PKHeX.Core/Resources/text/en/text_GroundTile_en.txt
Normal file
25
PKHeX.Core/Resources/text/en/text_GroundTile_en.txt
Normal file
@@ -0,0 +1,25 @@
|
||||
None
|
||||
Sand
|
||||
Grass
|
||||
|
||||
Rock
|
||||
Cave
|
||||
|
||||
Water
|
||||
|
||||
Building
|
||||
Marsh
|
||||
|
||||
Unspecific (DP)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Distortion World
|
||||
Unspecific (Pt/HGSS)
|
||||
@@ -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)
|
||||
25
PKHeX.Core/Resources/text/it/text_GroundTile_it.txt
Normal file
25
PKHeX.Core/Resources/text/it/text_GroundTile_it.txt
Normal file
@@ -0,0 +1,25 @@
|
||||
None
|
||||
Sand
|
||||
Grass
|
||||
|
||||
Rock
|
||||
Cave
|
||||
|
||||
Water
|
||||
|
||||
Building
|
||||
Marsh
|
||||
|
||||
Unspecific (DP)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Distortion World
|
||||
Unspecific (Pt/HGSS)
|
||||
@@ -1,25 +1,25 @@
|
||||
指定なし
|
||||
いわくだき (HGSS)
|
||||
草むら
|
||||
|
||||
ディアルガ / パルキア
|
||||
洞窟 / はじまりのま
|
||||
|
||||
なみのり / 釣り
|
||||
|
||||
建物 / なぞのすいしょう
|
||||
サファリ / 大湿原
|
||||
|
||||
御三家 / 化石 / ギフト (DP)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
やぶれたせかい (Pt)
|
||||
指定なし
|
||||
いわくだき (HGSS)
|
||||
草むら
|
||||
|
||||
ディアルガ / パルキア
|
||||
洞窟 / はじまりのま
|
||||
|
||||
なみのり / 釣り
|
||||
|
||||
建物 / なぞのすいしょう
|
||||
サファリ / 大湿原
|
||||
|
||||
御三家 / 化石 / ギフト (DP)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
やぶれたせかい (Pt)
|
||||
御三家 / 化石 / ギフト (Pt/DP)
|
||||
@@ -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();
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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 :
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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=経験値
|
||||
|
||||
@@ -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=경험치:
|
||||
|
||||
@@ -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=经验值:
|
||||
|
||||
Reference in New Issue
Block a user