Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2025-02-17 05:48:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revise ability patch/capsule message

Browse source 
Fix PCD logic flow
This commit is contained in:
Kurt 2021-10-02 10:25:52 -07:00
parent 015afdf369
commit f53f46c2e4
8 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
PKHeX.Core/Legality/Formatting/LegalityCheckStrings.cs
View file

@ -63,8 +63,8 @@ namespace PKHeX.Core
public static string L_XMatches0_1 { get; set; } = "Matches: {0} {1}"; 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 L_XWurmpleEvo_0 { get; set; } = "Wurmple Evolution: {0}";
public static string LAbilityCapsuleUsed { get; set; } = "Ability modified with Ability Capsule."; public static string LAbilityCapsuleUsed { get; set; } = "Ability available with Ability Capsule.";
public static string LAbilityPatchUsed { get; set; } = "Ability modified with Ability Patch."; public static string LAbilityPatchUsed { get; set; } = "Ability available with Ability Patch.";
public static string LAbilityFlag { get; set; } = "Ability matches ability number."; 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 LAbilityHiddenFail { get; set; } = "Hidden Ability mismatch for encounter type.";
public static string LAbilityHiddenUnavailable { get; set; } = "Hidden Ability not available."; public static string LAbilityHiddenUnavailable { get; set; } = "Hidden Ability not available.";

2
PKHeX.Core/Legality/Verifiers/Ability/AbilityVerifier.cs
View file

@ -313,7 +313,7 @@ namespace PKHeX.Core
var format = pkm.Format; var format = pkm.Format;
if (format >= 6) if (format >= 6)
{ {
if (CanAbilityCapsule(format, abilities)) if (!CanAbilityCapsule(format, abilities))
{ {
// Gen3-5 transfer with same ability -> 1st ability that matches // Gen3-5 transfer with same ability -> 1st ability that matches
if (pkm.AbilityNumber == 1) if (pkm.AbilityNumber == 1)

4
PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_de.txt
View file

@ -20,7 +20,7 @@ L_XKoreanNon = Non-Korean
L_XMatches0_1 = Matches: {0} {1} L_XMatches0_1 = Matches: {0} {1}
L_XOT = OT L_XOT = OT
L_XWurmpleEvo_0 = Wurmple Evolution: {0} L_XWurmpleEvo_0 = Wurmple Evolution: {0}
LAbilityCapsuleUsed = Ability modified with Ability Capsule. LAbilityCapsuleUsed = Ability available with Ability Capsule.
LAbilityFlag = Ability matches ability number. LAbilityFlag = Ability matches ability number.
LAbilityHiddenFail = Hidden Ability mismatch for encounter type. LAbilityHiddenFail = Hidden Ability mismatch for encounter type.
LAbilityHiddenUnavailable = Hidden Ability not available. 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. LAbilityMismatchHordeSafari = Hidden Ability on non-horde/friend safari wild encounter.
LAbilityMismatchPID = Ability does not match PID. LAbilityMismatchPID = Ability does not match PID.
LAbilityMismatchSOS = Hidden Ability on non-SOS wild encounter. 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. LAbilityUnexpected = Ability is not valid for species/form.
LAwakenedCap = Individual AV cannot be greater than {0}. LAwakenedCap = Individual AV cannot be greater than {0}.
LAwakenedEXPIncreased = All AVs are zero, but leveled above Met Level. LAwakenedEXPIncreased = All AVs are zero, but leveled above Met Level.

4
PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_en.txt
View file

@ -20,7 +20,7 @@ L_XKoreanNon = Non-Korean
L_XMatches0_1 = Matches: {0} {1} L_XMatches0_1 = Matches: {0} {1}
L_XOT = OT L_XOT = OT
L_XWurmpleEvo_0 = Wurmple Evolution: {0} L_XWurmpleEvo_0 = Wurmple Evolution: {0}
LAbilityCapsuleUsed = Ability modified with Ability Capsule. LAbilityCapsuleUsed = Ability available with Ability Capsule.
LAbilityFlag = Ability matches ability number. LAbilityFlag = Ability matches ability number.
LAbilityHiddenFail = Hidden Ability mismatch for encounter type. LAbilityHiddenFail = Hidden Ability mismatch for encounter type.
LAbilityHiddenUnavailable = Hidden Ability not available. 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. LAbilityMismatchHordeSafari = Hidden Ability on non-horde/friend safari wild encounter.
LAbilityMismatchPID = Ability does not match PID. LAbilityMismatchPID = Ability does not match PID.
LAbilityMismatchSOS = Hidden Ability on non-SOS wild encounter. 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. LAbilityUnexpected = Ability is not valid for species/form.
LAwakenedCap = Individual AV cannot be greater than {0}. LAwakenedCap = Individual AV cannot be greater than {0}.
LAwakenedEXPIncreased = All AVs are zero, but leveled above Met Level. LAwakenedEXPIncreased = All AVs are zero, but leveled above Met Level.

4
PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_es.txt
View file

@ -20,7 +20,7 @@ L_XKoreanNon = No es coreano.
L_XMatches0_1 = Coinciden: {0} {1} L_XMatches0_1 = Coinciden: {0} {1}
L_XOT = EO L_XOT = EO
L_XWurmpleEvo_0 = Evolución de Wurmple: {0} 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. LAbilityFlag = La Habilidad coincide con el número de habilidad.
LAbilityHiddenFail = La Habilidad Oculta no es correcta para el tipo de Encuentro. LAbilityHiddenFail = La Habilidad Oculta no es correcta para el tipo de Encuentro.
LAbilityHiddenUnavailable = Habilidad Oculta no disponible. 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. LAbilityMismatchHordeSafari = Habilidad Oculta en un Encuentro salvaje que no es mediante Hordas/Safari Amistad.
LAbilityMismatchPID = La Habilidad no coincide con el PID. LAbilityMismatchPID = La Habilidad no coincide con el PID.
LAbilityMismatchSOS = Habilidad Oculta en un Encuentro salvaje que no es por Llamada SOS. 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. LAbilityUnexpected = La Habilidad no es válida para esta Especie/Forma.
LAwakenedCap = Los AV individuales no pueden ser mayor que: {0}. 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. LAwakenedEXPIncreased = Todos los AVs son cero, pero está nivelado por encima del Nivel de Encuentro.

4
PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_fr.txt
View file

@ -20,7 +20,7 @@ L_XKoreanNon = Non-Coréen
L_XMatches0_1 = Correspondances : {0} {1} L_XMatches0_1 = Correspondances : {0} {1}
L_XOT = DO L_XOT = DO
L_XWurmpleEvo_0 = Évolution de Chenipotte : {0} 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. LAbilityFlag = Le Talent correspond à son index.
LAbilityHiddenFail = Talent incompatible avec type de rencontre. LAbilityHiddenFail = Talent incompatible avec type de rencontre.
LAbilityHiddenUnavailable = Ce Pokémon n'a pas de talent caché. 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). 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. 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). 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. LAbilityUnexpected = Talent incompatible avec espèce / forme.
LAwakenedCap = La valeur AV individuelle ne peut pas être supérieure à {0}. 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. LAwakenedEXPIncreased = Tous les AV sont nuls, mais nivelés au-dessus du niveau Met.

4
PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_it.txt
View file

@ -20,7 +20,7 @@ L_XKoreanNon = Non-Korean
L_XMatches0_1 = Matches: {0} {1} L_XMatches0_1 = Matches: {0} {1}
L_XOT = OT L_XOT = OT
L_XWurmpleEvo_0 = Wurmple Evolution: {0} L_XWurmpleEvo_0 = Wurmple Evolution: {0}
LAbilityCapsuleUsed = Ability modified with Ability Capsule. LAbilityCapsuleUsed = Ability available with Ability Capsule.
LAbilityFlag = Ability matches ability number. LAbilityFlag = Ability matches ability number.
LAbilityHiddenFail = Hidden Ability mismatch for encounter type. LAbilityHiddenFail = Hidden Ability mismatch for encounter type.
LAbilityHiddenUnavailable = Hidden Ability not available. 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. LAbilityMismatchHordeSafari = Hidden Ability on non-horde/friend safari wild encounter.
LAbilityMismatchPID = Ability does not match PID. LAbilityMismatchPID = Ability does not match PID.
LAbilityMismatchSOS = Hidden Ability on non-SOS wild encounter. 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. LAbilityUnexpected = Ability is not valid for species/form.
LAwakenedCap = Individual AV cannot be greater than {0}. LAwakenedCap = Individual AV cannot be greater than {0}.
LAwakenedEXPIncreased = All AVs are zero, but leveled above Met Level. LAwakenedEXPIncreased = All AVs are zero, but leveled above Met Level.

4
PKHeX.Core/Resources/legality/checks/LegalityCheckStrings_ja.txt
View file

@ -20,7 +20,7 @@ L_XKoreanNon = Non-Korean
L_XMatches0_1 = Matches: {0} {1} L_XMatches0_1 = Matches: {0} {1}
L_XOT = OT L_XOT = OT
L_XWurmpleEvo_0 = Wurmple Evolution: {0} L_XWurmpleEvo_0 = Wurmple Evolution: {0}
LAbilityCapsuleUsed = Ability modified with Ability Capsule. LAbilityCapsuleUsed = Ability available with Ability Capsule.
LAbilityFlag = Ability matches ability number. LAbilityFlag = Ability matches ability number.
LAbilityHiddenFail = 隠れ特性がエンカウントタイプと一致しません LAbilityHiddenFail = 隠れ特性がエンカウントタイプと一致しません
LAbilityHiddenUnavailable = 隠れ特性は無効です LAbilityHiddenUnavailable = 隠れ特性は無効です
@ -32,7 +32,7 @@ LAbilityMismatchGrotto = Hidden Grotto captures should have Hidden Ability.
LAbilityMismatchHordeSafari = Hidden Ability on non-horde/friend safari wild encounter. LAbilityMismatchHordeSafari = Hidden Ability on non-horde/friend safari wild encounter.
LAbilityMismatchPID = 特性と性格値が一致しません。性格値を再生成してください。 LAbilityMismatchPID = 特性と性格値が一致しません。性格値を再生成してください。
LAbilityMismatchSOS = Hidden Ability on non-SOS wild encounter. 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. LAbilityUnexpected = Ability is not valid for species/form.
LAwakenedCap = Individual AV cannot be greater than {0}. LAwakenedCap = Individual AV cannot be greater than {0}.
LAwakenedEXPIncreased = All AVs are zero, but leveled above Met Level. LAwakenedEXPIncreased = All AVs are zero, but leveled above Met Level.