diff --git a/PKHeX.Core/Legality/Formatting/LegalityCheckStrings.cs b/PKHeX.Core/Legality/Formatting/LegalityCheckStrings.cs index fcf05803c..e4f9a5557 100644 --- a/PKHeX.Core/Legality/Formatting/LegalityCheckStrings.cs +++ b/PKHeX.Core/Legality/Formatting/LegalityCheckStrings.cs @@ -63,8 +63,8 @@ namespace PKHeX.Core public static string L_XMatches0_1 { get; set; } = "Matches: {0} {1}"; public static string L_XWurmpleEvo_0 { get; set; } = "Wurmple Evolution: {0}"; - public static string LAbilityCapsuleUsed { get; set; } = "Ability modified with Ability Capsule."; - public static string LAbilityPatchUsed { get; set; } = "Ability modified with Ability Patch."; + public static string LAbilityCapsuleUsed { get; set; } = "Ability available with Ability Capsule."; + public static string LAbilityPatchUsed { get; set; } = "Ability available with Ability Patch."; public static string LAbilityFlag { get; set; } = "Ability matches ability number."; public static string LAbilityHiddenFail { get; set; } = "Hidden Ability mismatch for encounter type."; public static string LAbilityHiddenUnavailable { get; set; } = "Hidden Ability not available."; diff --git a/PKHeX.Core/Legality/Verifiers/Ability/AbilityVerifier.cs b/PKHeX.Core/Legality/Verifiers/Ability/AbilityVerifier.cs index cdc37fd80..97bd408e2 100644 --- a/PKHeX.Core/Legality/Verifiers/Ability/AbilityVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/Ability/AbilityVerifier.cs @@ -313,7 +313,7 @@ namespace PKHeX.Core var format = pkm.Format; if (format >= 6) { - if (CanAbilityCapsule(format, abilities)) + if (!CanAbilityCapsule(format, abilities)) { // Gen3-5 transfer with same ability -> 1st ability that matches if (pkm.AbilityNumber == 1) diff --git a/PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_de.txt b/PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_de.txt index b3ef077ce..89ed3e3c1 100644 --- a/PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_de.txt +++ b/PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_de.txt @@ -20,7 +20,7 @@ L_XKoreanNon = Non-Korean L_XMatches0_1 = Matches: {0} {1} L_XOT = OT L_XWurmpleEvo_0 = Wurmple Evolution: {0} -LAbilityCapsuleUsed = Ability modified with Ability Capsule. +LAbilityCapsuleUsed = Ability available with Ability Capsule. LAbilityFlag = Ability matches ability number. LAbilityHiddenFail = Hidden Ability mismatch for encounter type. LAbilityHiddenUnavailable = Hidden Ability not available. @@ -32,7 +32,7 @@ LAbilityMismatchGrotto = Hidden Grotto captures should have Hidden Ability. LAbilityMismatchHordeSafari = Hidden Ability on non-horde/friend safari wild encounter. LAbilityMismatchPID = Ability does not match PID. LAbilityMismatchSOS = Hidden Ability on non-SOS wild encounter. -LAbilityPatchUsed = Ability modified with Ability Patch. +LAbilityPatchUsed = Ability available with Ability Patch. LAbilityUnexpected = Ability is not valid for species/form. LAwakenedCap = Individual AV cannot be greater than {0}. LAwakenedEXPIncreased = All AVs are zero, but leveled above Met Level. diff --git a/PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_en.txt b/PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_en.txt index 34f65aba4..ffd1ec2aa 100644 --- a/PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_en.txt +++ b/PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_en.txt @@ -20,7 +20,7 @@ L_XKoreanNon = Non-Korean L_XMatches0_1 = Matches: {0} {1} L_XOT = OT L_XWurmpleEvo_0 = Wurmple Evolution: {0} -LAbilityCapsuleUsed = Ability modified with Ability Capsule. +LAbilityCapsuleUsed = Ability available with Ability Capsule. LAbilityFlag = Ability matches ability number. LAbilityHiddenFail = Hidden Ability mismatch for encounter type. LAbilityHiddenUnavailable = Hidden Ability not available. @@ -32,7 +32,7 @@ LAbilityMismatchGrotto = Hidden Grotto captures should have Hidden Ability. LAbilityMismatchHordeSafari = Hidden Ability on non-horde/friend safari wild encounter. LAbilityMismatchPID = Ability does not match PID. LAbilityMismatchSOS = Hidden Ability on non-SOS wild encounter. -LAbilityPatchUsed = Ability modified with Ability Patch. +LAbilityPatchUsed = Ability available with Ability Patch. LAbilityUnexpected = Ability is not valid for species/form. LAwakenedCap = Individual AV cannot be greater than {0}. LAwakenedEXPIncreased = All AVs are zero, but leveled above Met Level. diff --git a/PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_es.txt b/PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_es.txt index 55c01f607..8387d182e 100644 --- a/PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_es.txt +++ b/PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_es.txt @@ -20,7 +20,7 @@ L_XKoreanNon = No es coreano. L_XMatches0_1 = Coinciden: {0} {1} L_XOT = EO L_XWurmpleEvo_0 = Evolución de Wurmple: {0} -LAbilityCapsuleUsed = Habilidad modificada con una Cápsula Habilidad. +LAbilityCapsuleUsed = Habilidad disponible con una Cápsula Habilidad. LAbilityFlag = La Habilidad coincide con el número de habilidad. LAbilityHiddenFail = La Habilidad Oculta no es correcta para el tipo de Encuentro. LAbilityHiddenUnavailable = Habilidad Oculta no disponible. @@ -32,7 +32,7 @@ LAbilityMismatchGrotto = Las capturas en el Claro Oculto deben tener Habilidad O LAbilityMismatchHordeSafari = Habilidad Oculta en un Encuentro salvaje que no es mediante Hordas/Safari Amistad. LAbilityMismatchPID = La Habilidad no coincide con el PID. LAbilityMismatchSOS = Habilidad Oculta en un Encuentro salvaje que no es por Llamada SOS. -LAbilityPatchUsed = Habilidad modificada con parche de habilidad. +LAbilityPatchUsed = Habilidad disponible con parche de habilidad. LAbilityUnexpected = La Habilidad no es válida para esta Especie/Forma. LAwakenedCap = Los AV individuales no pueden ser mayor que: {0}. LAwakenedEXPIncreased = Todos los AVs son cero, pero está nivelado por encima del Nivel de Encuentro. diff --git a/PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_fr.txt b/PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_fr.txt index 11d8d0b3a..a79938af9 100644 --- a/PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_fr.txt +++ b/PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_fr.txt @@ -20,7 +20,7 @@ L_XKoreanNon = Non-Coréen L_XMatches0_1 = Correspondances : {0} {1} L_XOT = DO L_XWurmpleEvo_0 = Évolution de Chenipotte : {0} -LAbilityCapsuleUsed = Talent modifié avec la pilule Talent. +LAbilityCapsuleUsed = Talent disponible avec la pilule Talent. LAbilityFlag = Le Talent correspond à son index. LAbilityHiddenFail = Talent incompatible avec type de rencontre. LAbilityHiddenUnavailable = Ce Pokémon n'a pas de talent caché. @@ -32,7 +32,7 @@ LAbilityMismatchGrotto = Les Pokémon des Trouées Cachées doivent avoir leur T LAbilityMismatchHordeSafari = Talent caché, Pokémon rencontré dans la nature (mais pas dans un Safari des amis ni dans une horde). LAbilityMismatchPID = Le Talent ne correspond pas au PID du Pokémon. LAbilityMismatchSOS = Talent caché, Pokémon rencontré dans la nature (mais pas en appels SOS). -LAbilityPatchUsed = Capacité modifiée avec le patch de capacité. +LAbilityPatchUsed = Talent disponible avec le patch de Talent. LAbilityUnexpected = Talent incompatible avec espèce / forme. LAwakenedCap = La valeur AV individuelle ne peut pas être supérieure à {0}. LAwakenedEXPIncreased = Tous les AV sont nuls, mais nivelés au-dessus du niveau Met. diff --git a/PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_it.txt b/PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_it.txt index b3ef077ce..89ed3e3c1 100644 --- a/PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_it.txt +++ b/PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_it.txt @@ -20,7 +20,7 @@ L_XKoreanNon = Non-Korean L_XMatches0_1 = Matches: {0} {1} L_XOT = OT L_XWurmpleEvo_0 = Wurmple Evolution: {0} -LAbilityCapsuleUsed = Ability modified with Ability Capsule. +LAbilityCapsuleUsed = Ability available with Ability Capsule. LAbilityFlag = Ability matches ability number. LAbilityHiddenFail = Hidden Ability mismatch for encounter type. LAbilityHiddenUnavailable = Hidden Ability not available. @@ -32,7 +32,7 @@ LAbilityMismatchGrotto = Hidden Grotto captures should have Hidden Ability. LAbilityMismatchHordeSafari = Hidden Ability on non-horde/friend safari wild encounter. LAbilityMismatchPID = Ability does not match PID. LAbilityMismatchSOS = Hidden Ability on non-SOS wild encounter. -LAbilityPatchUsed = Ability modified with Ability Patch. +LAbilityPatchUsed = Ability available with Ability Patch. LAbilityUnexpected = Ability is not valid for species/form. LAwakenedCap = Individual AV cannot be greater than {0}. LAwakenedEXPIncreased = All AVs are zero, but leveled above Met Level. diff --git a/PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_ja.txt b/PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_ja.txt index 129e8aee3..2f68829fe 100644 --- a/PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_ja.txt +++ b/PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_ja.txt @@ -20,7 +20,7 @@ L_XKoreanNon = Non-Korean L_XMatches0_1 = Matches: {0} {1} L_XOT = OT L_XWurmpleEvo_0 = Wurmple Evolution: {0} -LAbilityCapsuleUsed = Ability modified with Ability Capsule. +LAbilityCapsuleUsed = Ability available with Ability Capsule. LAbilityFlag = Ability matches ability number. LAbilityHiddenFail = 隠れ特性がエンカウントタイプと一致しません LAbilityHiddenUnavailable = 隠れ特性は無効です @@ -32,7 +32,7 @@ LAbilityMismatchGrotto = Hidden Grotto captures should have Hidden Ability. LAbilityMismatchHordeSafari = Hidden Ability on non-horde/friend safari wild encounter. LAbilityMismatchPID = 特性と性格値が一致しません。性格値を再生成してください。 LAbilityMismatchSOS = Hidden Ability on non-SOS wild encounter. -LAbilityPatchUsed = Ability modified with Ability Patch. +LAbilityPatchUsed = Ability available with Ability Patch. LAbilityUnexpected = Ability is not valid for species/form. LAwakenedCap = Individual AV cannot be greater than {0}. LAwakenedEXPIncreased = All AVs are zero, but leveled above Met Level.