461fb70f90 (commitcomment-22965638)
This commit is contained in:
Kurt 2017-07-06 22:05:54 -07:00
parent a653363a16
commit 60becb6e37
5 changed files with 17 additions and 17 deletions

View File

@ -1351,7 +1351,7 @@ private void VerifyBall()
{
if (pkm.Met_Location == 30016 && pkm.Gen7) // Poké Pelago
VerifyBallEquals(4); // Pokeball
// For gen3/4 safari zones and BCC getValidWildEncounters already filter to not return
// For gen3/4 Safari Zones and BCC getValidWildEncounters already filter to not return
// mixed possible encounters between safari, BCC and other encounters
// That means is the first encounter is not safari then there is no safari encounter in the array
else if (3 <= pkm.GenNumber && pkm.GenNumber <= 4 && EncounterGenerator.IsSafariSlot(w.Type))

View File

@ -407,12 +407,12 @@ public static class LegalityCheckStrings
public static string V601 { get; set; } = "Missing Ribbons: {0}";
public static string V602 { get; set; } = "All ribbons accounted for.";
public static string V603 { get; set; } = "Can't receive Ribbon(s) as an Egg.";
public static string V604 { get; set; } = "Found a tree for crystal heabutt encounter that matches OTID";
public static string V605 { get; set; } = "Found an unreacheable tree for crystal heabutt encounter that matches OTID.";
public static string V606 { get; set; } = "Could not found a tree for crystal heabutt encounter that matches OTID.";
public static string V604 { get; set; } = "Found a tree for Crystal headbutt encounter that matches OTID";
public static string V605 { get; set; } = "Found an unreacheable tree for Crystal headbutt encounter that matches OTID.";
public static string V606 { get; set; } = "Could not find a tree for Crystal headbutt encounter that matches OTID.";
public static string V607 { get; set; } = "Kanto Route 14 fishing encounter. Unreachable Water tiles.";
public static string V608 { get; set; } = "National Park fishing encounter. Unreachable Water tiles.";
public static string V609 { get; set; } = "Generation 2 safari zone fishing encounter. Unreachable zone.";
public static string V609 { get; set; } = "Generation 2 Safari Zone fishing encounter. Unreachable zone.";
#endregion
}

View File

@ -344,9 +344,9 @@ V602 = All ribbons accounted for.
V600 = Missing Ribbons: {0}
V601 = Invalid Ribbons: {0}
V603 = Can't receive Ribbon(s) as an Egg.
V604 = Found a tree for crystal heabutt encounter that matches OTID.
V605 = Found an unreacheable tree for crystal heabutt encounter that matches OTID.
V606 = Could not found a tree for crystal heabutt encounter that matches OTID.
V604 = Found a tree for Crystal headbutt encounter that matches OTID.
V605 = Found an unreacheable tree for Crystal headbutt encounter that matches OTID.
V606 = Could not find a tree for Crystal headbutt encounter that matches OTID.
V607 = Kanto Route 14 fishing encounter. Unreachable Water tiles.
V608 = National Park fishing encounter. Unreachable Water tiles.
V609 = Generation 2 safari zone fishing encounter. Unreachable zone.
V609 = Generation 2 Safari Zone fishing encounter. Unreachable zone.

View File

@ -344,9 +344,9 @@ V602 = 모든 리본이 채워졌습니다.
V600 = 없는 리본: {0}
V601 = 사용할 수 없는 리본: {0}
V603 = 알은 리본을 얻을 수 없습니다.
V604 = Found a tree for crystal heabutt encounter that matches OTID.
V605 = Found an unreacheable tree for crystal heabutt encounter that matches OTID.
V606 = Could not found a tree for crystal heabutt encounter that matches OTID.
V604 = Found a tree for Crystal headbutt encounter that matches OTID.
V605 = Found an unreacheable tree for Crystal headbutt encounter that matches OTID.
V606 = Could not find a tree for Crystal headbutt encounter that matches OTID.
V607 = Kanto Route 14 fishing encounter. Unreachable Water tiles.
V608 = National Park fishing encounter. Unreachable Water tiles.
V609 = Generation 2 safari zone fishing encounter. Unreachable zone.
V609 = Generation 2 Safari Zone fishing encounter. Unreachable zone.

View File

@ -344,9 +344,9 @@ V602 = 所有奖章合法。
V600 = 缺失奖章: {0}
V601 = 不合法奖章: {0}
V603 = 蛋不能接受奖章。
V604 = Found a tree for crystal heabutt encounter that matches OTID.
V605 = Found an unreacheable tree for crystal heabutt encounter that matches OTID.
V606 = Could not found a tree for crystal heabutt encounter that matches OTID.
V604 = Found a tree for Crystal headbutt encounter that matches OTID.
V605 = Found an unreacheable tree for Crystal headbutt encounter that matches OTID.
V606 = Could not find a tree for Crystal headbutt encounter that matches OTID.
V607 = Kanto Route 14 fishing encounter. Unreachable Water tiles.
V608 = National Park fishing encounter. Unreachable Water tiles.
V609 = Generation 2 safari zone fishing encounter. Unreachable zone.
V609 = Generation 2 Safari Zone fishing encounter. Unreachable zone.