Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-09-08 21:55:50 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix misspelling of the word "Received"

Browse Source 
Closes #2757

Co-Authored-By: pi1024e <pi1024e@users.noreply.github.com>
This commit is contained in:
Kurt
2020-03-12 15:05:34 -07:00
parent eb01591861
commit fbd533092d
15 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PKHeX.Core/Legality/Encounters/Verifiers/MysteryGiftVerifier.cs
View File

@@ -39,7 +39,7 @@ public static CheckResult VerifyGift(PKM pk, MysteryGift g)
return new CheckResult(CheckIdentifier.GameOrigin);
var ver = (int)val >> 16;
if (ver != 0 && !CanVersionRecieveGift(g.Format, ver, pk.Version))
if (ver != 0 && !CanVersionReceiveGift(g.Format, ver, pk.Version))
return new CheckResult(Severity.Invalid, LEncGiftVersionNotDistributed, CheckIdentifier.GameOrigin);
var lang = val & MysteryGiftRestriction.LangRestrict;
@@ -72,7 +72,7 @@ public static bool IsValidChangedOTName(PKM pk, MysteryGift g)
return CurrentOTMatchesReplaced(g.Format, pk.OT_Name);
}
private static bool CanVersionRecieveGift(int format, int version4bit, int version)
private static bool CanVersionReceiveGift(int format, int version4bit, int version)
{
return format switch
{

4
PKHeX.Core/MysteryGifts/MysteryUtil.cs
View File

@@ -125,7 +125,7 @@ public static bool IsCardCompatible(this MysteryGift g, SaveFile SAV, out string
return false;
}
if (!SAV.CanRecieveGift(g))
if (!SAV.CanReceiveGift(g))
{
message = MsgMysteryGiftTypeDetails;
return false;
@@ -150,7 +150,7 @@ public static bool IsCardCompatible(this MysteryGift g, SaveFile SAV, out string
/// <param name="SAV">Save file receiving the gift data.</param>
/// <param name="gift">Gift data to potentially insert to the save file.</param>
/// <returns>True if compatible, false if incompatible.</returns>
public static bool CanRecieveGift(this SaveFile SAV, MysteryGift gift)
public static bool CanReceiveGift(this SaveFile SAV, MysteryGift gift)
{
if (gift.Species > SAV.MaxSpeciesID)
return false;

2
PKHeX.Core/Resources/text/de/MessageStrings_de.txt
View File

@@ -221,7 +221,7 @@ MsgMysteryGiftSlotSpecialReject = Does this Mystery Gift really belong to this g
MsgMysteryGiftSlotAlternate = {0} gift was set to to a {1} slot instead.
MsgMysteryGiftSlotFailSwap = Can't swap a {0} with a {1}.
MsgMysteryGiftQRTypeLength = Decoded data length not valid for loaded save file.
MsgMysteryGiftQRRecieved = QR Gift Type:
MsgMysteryGiftQRReceived = QR Gift Type:
MsgMysteryGiftQREonTicket = Eon Ticket Mystery Gift will not import correctly when received via QR.
MsgMysteryGiftQREonTicketAdvice = Inject the Eon Ticket Mystery Gift to the save file instead.
MsgItemPouchUnknown = Unknown item detected.

2
PKHeX.Core/Resources/text/en/MessageStrings_en.txt
View File

@@ -221,7 +221,7 @@ MsgMysteryGiftSlotSpecialReject = Does this Mystery Gift really belong to this g
MsgMysteryGiftSlotAlternate = {0} gift was set to to a {1} slot instead.
MsgMysteryGiftSlotFailSwap = Can't swap a {0} with a {1}.
MsgMysteryGiftQRTypeLength = Decoded data length not valid for loaded save file.
MsgMysteryGiftQRRecieved = QR Gift Type:
MsgMysteryGiftQRReceived = QR Gift Type:
MsgMysteryGiftQREonTicket = Eon Ticket Mystery Gift will not import correctly when received via QR.
MsgMysteryGiftQREonTicketAdvice = Inject the Eon Ticket Mystery Gift to the save file instead.
MsgItemPouchUnknown = Unknown item detected.

2
PKHeX.Core/Resources/text/es/MessageStrings_es.txt
View File

@@ -221,7 +221,7 @@ MsgMysteryGiftSlotSpecialReject = ¿Este Regalo Misterioso realmente pertenece a
MsgMysteryGiftSlotAlternate = Regalo {0} se estableció en el espacio {1} en su lugar.
MsgMysteryGiftSlotFailSwap = No se puede cambiar {0} con {1}.
MsgMysteryGiftQRTypeLength = La longitud de los datos decodificados no es válida para el archivo guardado cargado.
MsgMysteryGiftQRRecieved = Tipo de Regalo QR:
MsgMysteryGiftQRReceived = Tipo de Regalo QR:
MsgMysteryGiftQREonTicket = Regalo Misterioso del Ticket Eon no se importará correctamente cuando se reciba a través de QR.
MsgMysteryGiftQREonTicketAdvice = Inyecte el Regalo Misterioso del Ticket Eon en el archivo de guardado en su lugar.
MsgItemPouchUnknown = Se detectó un Objeto desconocido.

2
PKHeX.Core/Resources/text/fr/MessageStrings_fr.txt
View File

@@ -221,7 +221,7 @@ MsgMysteryGiftSlotSpecialReject = Ce Cadeau Mystère appartient-il vraiment à c
MsgMysteryGiftSlotAlternate = {0} gift was set to to a {1} slot instead.
MsgMysteryGiftSlotFailSwap = Impossible d'échanger {0} pour {1}.
MsgMysteryGiftQRTypeLength = Taille de données décodées invalide pour cette sauvegarde.
MsgMysteryGiftQRRecieved = Type de Cadeau QR:
MsgMysteryGiftQRReceived = Type de Cadeau QR:
MsgMysteryGiftQREonTicket = Eon Ticket Mystery Gift will not import correctly when received via QR.
MsgMysteryGiftQREonTicketAdvice = Inject the Eon Ticket Mystery Gift to the save file instead.
MsgItemPouchUnknown = Objet inconnu détecté.

2
PKHeX.Core/Resources/text/it/MessageStrings_it.txt
View File

@@ -221,7 +221,7 @@ MsgMysteryGiftSlotSpecialReject = Does this Mystery Gift really belong to this g
MsgMysteryGiftSlotAlternate = {0} gift was set to to a {1} slot instead.
MsgMysteryGiftSlotFailSwap = Can't swap a {0} with a {1}.
MsgMysteryGiftQRTypeLength = Decoded data length not valid for loaded save file.
MsgMysteryGiftQRRecieved = QR Gift Type:
MsgMysteryGiftQRReceived = QR Gift Type:
MsgMysteryGiftQREonTicket = Eon Ticket Mystery Gift will not import correctly when received via QR.
MsgMysteryGiftQREonTicketAdvice = Inject the Eon Ticket Mystery Gift to the save file instead.
MsgItemPouchUnknown = Unknown item detected.

2
PKHeX.Core/Resources/text/ja/MessageStrings_ja.txt
View File

@@ -221,7 +221,7 @@ MsgMysteryGiftSlotSpecialReject = Does this Mystery Gift really belong to this g
MsgMysteryGiftSlotAlternate = {0} gift was set to to a {1} slot instead.
MsgMysteryGiftSlotFailSwap = Can't swap a {0} with a {1}.
MsgMysteryGiftQRTypeLength = Decoded data length not valid for loaded save file.
MsgMysteryGiftQRRecieved = QR Gift Type:
MsgMysteryGiftQRReceived = QR Gift Type:
MsgMysteryGiftQREonTicket = Eon Ticket Mystery Gift will not import correctly when received via QR.
MsgMysteryGiftQREonTicketAdvice = Inject the Eon Ticket Mystery Gift to the save file instead.
MsgItemPouchUnknown = Unknown item detected.

2
PKHeX.Core/Resources/text/ko/MessageStrings_ko.txt
View File

@@ -221,7 +221,7 @@ MsgMysteryGiftSlotSpecialReject = 정말 이 게임에 맞는 이상한소포가
MsgMysteryGiftSlotAlternate = {0} 소포를 {1} 슬롯으로 바꾸어 지정했습니다.
MsgMysteryGiftSlotFailSwap = Can't swap a {0} with a {1}.
MsgMysteryGiftQRTypeLength = 해독한 데이터 길이가 이 세이브 파일과 호환되지 않습니다.
MsgMysteryGiftQRRecieved = QR 선물 유형:
MsgMysteryGiftQRReceived = QR 선물 유형:
MsgMysteryGiftQREonTicket = 무한티켓이 담긴 이상한소포는 QR로 받았을 때 정상적으로 불러올 수 없습니다.
MsgMysteryGiftQREonTicketAdvice = 무한티켓이 담긴 이상한소포를 세이브 파일에 직접 추가하세요.
MsgItemPouchUnknown = 알 수 없는 아이템을 발견했습니다.

2
PKHeX.Core/Resources/text/zh/MessageStrings_zh.txt
View File

@@ -221,7 +221,7 @@ MsgMysteryGiftSlotSpecialReject = 当前神秘礼物真的属于该游戏吗?
MsgMysteryGiftSlotAlternate = {0} 礼物已另被设置到格子 {1} 。
MsgMysteryGiftSlotFailSwap = 无法将 {0} 与 {1} 交换。
MsgMysteryGiftQRTypeLength = 解码后的数据大小对于当前存档不兼容。
MsgMysteryGiftQRRecieved = QR 礼物类型:
MsgMysteryGiftQRReceived = QR 礼物类型:
MsgMysteryGiftQREonTicket = 无限船票的神秘礼物无法从QR导入。
MsgMysteryGiftQREonTicketAdvice = 注入无限船票的神秘礼物至存档文件?
MsgItemPouchUnknown = 检测到未知道具。

4
PKHeX.Core/Saves/Substructures/Records.cs
View File

@@ -346,7 +346,7 @@ public static int GetOffset(int baseOfs, int recordID)
{179, "Shiny Pokemon Encountered"},
{180, "Trick House Clears"},
{181, "Eon Ticket 1 (Spotpass)"},
{181, "Eon Ticket 1 (SpotPass)"},
{182, "Eon Ticket 2 (Mystery Gift)"},
};
@@ -469,7 +469,7 @@ public static int GetOffset(int baseOfs, int recordID)
{137, "Battle Royal Dome Battles"},
{138, "Items Picked Up after Battle"},
{139, "Ate in Malasadas Shop"},
{140, "Hyper Trainings Recieved"},
{140, "Hyper Trainings Received"},
{141, "Dishes eaten in Battle Buffet"},
{142, "Pokémon Refresh Accessed"},
{143, "Pokémon Storage System Log-outs"},

2
PKHeX.Core/Util/MessageStrings.cs
View File

@@ -296,7 +296,7 @@ public static class MessageStrings
public static string MsgMysteryGiftSlotFailSwap { get; set; } = "Can't swap a {0} with a {1}.";
public static string MsgMysteryGiftQRTypeLength { get; set; } = "Decoded data length not valid for loaded save file.";
public static string MsgMysteryGiftQRRecieved { get; set; } = "QR Gift Type:";
public static string MsgMysteryGiftQRReceived { get; set; } = "QR Gift Type:";
public static string MsgMysteryGiftQREonTicket { get; set; } = "Eon Ticket Mystery Gift will not import correctly when received via QR.";
public static string MsgMysteryGiftQREonTicketAdvice { get; set; } = "Inject the Eon Ticket Mystery Gift to the save file instead.";

4
PKHeX.WinForms/Resources/text/changelog_2018.txt
View File

@@ -1015,7 +1015,7 @@
- Fixed: Glass (Colored) Flutes should now be in the proper pouch. Thanks SoujiSeta!
- Fixed: Super Training copying too much and erroring out. Thanks SoujiSeta!
- Fixed: Mono compatibility fix for inventory data editing. Thanks SoujiSeta!
- Fixed: Deleting Wonder Card recieved flags will actually save. Thanks ifyfg!
- Fixed: Deleting Wonder Card Received flags will actually save. Thanks ifyfg!
- Fixed: X/Y xorpad auto-loading/decryption now works instead of hanging.
15/01/01 - New Update: (5300)
@@ -1135,7 +1135,7 @@
- Added: Hex view (as decimal) of the current appearance for advanced editing.
- Added: Opening of files via command line arguments (dragging onto .exe).
- Added: Auto-loading of "main" file on startup if it exists.
- Fixed: Nice Recieved is actually @ 0x0EC. Added "People Met Online" @ 0x0F4.
- Fixed: Nice Received is actually @ 0x0EC. Added "People Met Online" @ 0x0F4.
- Fixed: Load Boxes from Folder will no longer give bad eggs in empty slots.
- Fixed: Can no longer set illegal Dex entries (either manually or via Give All)
- Misc: Cleaned up some code, reduced file size.

2
PKHeX.WinForms/Subforms/Save Editors/SAV_Wondercard.Designer.cs generated
View File

@@ -123,7 +123,7 @@ private void InitializeComponent()
this.flagDel.Name = "flagDel";
this.flagDel.Size = new System.Drawing.Size(107, 22);
this.flagDel.Text = "Delete";
this.flagDel.Click += new System.EventHandler(this.ClearRecievedFlag);
this.flagDel.Click += new System.EventHandler(this.ClearReceivedFlag);
//
// L_Received
//

6
PKHeX.WinForms/Subforms/Save Editors/SAV_Wondercard.cs
View File

@@ -246,7 +246,7 @@ private void B_Save_Click(object sender, EventArgs e)
}
// Delete Received Flag
private void ClearRecievedFlag(object sender, EventArgs e)
private void ClearReceivedFlag(object sender, EventArgs e)
{
if (LB_Received.SelectedIndex < 0)
return;
@@ -360,8 +360,8 @@ private void ImportQRToView(string url)
if (mga.Gifts.All(card => card.Data.Length != data.Length))
WinFormsUtil.Alert(MsgMysteryGiftQRTypeLength, string.Format(MsgQRDecodeSize, $"0x{data.Length:X}"));
else if (types.All(type => type != giftType))
WinFormsUtil.Alert(MsgMysteryGiftTypeIncompatible, $"{MsgMysteryGiftQRRecieved} {gift.Type}{Environment.NewLine}{MsgMysteryGiftTypeUnexpected} {string.Join(", ", types)}");
else if (!SAV.CanRecieveGift(gift))
WinFormsUtil.Alert(MsgMysteryGiftTypeIncompatible, $"{MsgMysteryGiftQRReceived} {gift.Type}{Environment.NewLine}{MsgMysteryGiftTypeUnexpected} {string.Join(", ", types)}");
else if (!SAV.CanReceiveGift(gift))
WinFormsUtil.Alert(MsgMysteryGiftTypeDetails);
else
ViewGiftData(gift);