Skip to content

Commit ed31b7b

Browse files
committed
Refactor catchability logic
1 parent 00e8129 commit ed31b7b

2 files changed

Lines changed: 11 additions & 3 deletions

File tree

TeraFinder.Core/Classes/EncounterTF9/EncounterRaidTF9.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,15 @@ public abstract record EncounterRaidTF9 : IExtendedTeraRaid9
5252
public string LongName => Name;
5353
public string Name => $"{(IsMighty ? "Mighty " : "")}{(Species)Species}-{Form}";
5454

55-
public bool CanBeCaught => Identifier != 2025072301u; //Shiny Wo-Chien
55+
public bool IsCatchable => !NonCatchable.Contains(Identifier);
56+
private static readonly uint[] NonCatchable =
57+
[
58+
2025072301u, // Shiny Wo-Chien
59+
2025080401u, // Shiny Chien-Pao
60+
2025081801u, // Shiny Ting-Lu
61+
2025090101u, // Shiny Chi-Yu
62+
63+
];
5664

5765
public abstract bool CanBeEncountered(uint seed);
5866

TeraFinder.Plugins/Utils/GridUtil.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public static void SaveSelectedPk9(this DataGridView dataGrid, CalculatorForm f,
161161
var encounters = f.Editor.GetCurrentEncounters(content, map);
162162
if (EncounterRaidTF9.TryGenerateTeraDetails(seed, encounters, version, progress, eventProgress, content, map, id32, groupid, out var enc, out var result))
163163
{
164-
if (enc.CanBeCaught)
164+
if (enc.IsCatchable)
165165
{
166166
var settings = LegalityUtil.StoreLegalitySettings();
167167
LegalityUtil.SetDefaultlegalitySettings();
@@ -391,7 +391,7 @@ public static void SendSelectedPk9Editor(this DataGridView dataGrid, CalculatorF
391391

392392
if (EncounterRaidTF9.TryGenerateTeraDetails(seed, encounters, version, progress, eventProgress, content, map, id32, groupid, out var enc, out var result))
393393
{
394-
if (enc.CanBeCaught)
394+
if (enc.IsCatchable)
395395
{
396396
if (!enc.GeneratePK9(result.Value, id32, version, f.Editor.SAV.OT, f.Editor.SAV.Language, f.Editor.SAV.Gender, out var pk9, out var la))
397397
{

0 commit comments

Comments
 (0)