diff --git a/pkNX.WinForms/Dumping/SV/Encounter/PaldeaEncounter.cs b/pkNX.WinForms/Dumping/SV/Encounter/PaldeaEncounter.cs index f1596306..51b09322 100644 --- a/pkNX.WinForms/Dumping/SV/Encounter/PaldeaEncounter.cs +++ b/pkNX.WinForms/Dumping/SV/Encounter/PaldeaEncounter.cs @@ -54,7 +54,7 @@ private string GetString(string species) { var form = Form == 0 ? "" : $"-{Form}"; var sex = Sex == 0 ? "" : $" (sex={Sex})"; - return $"{species}{form}{sex} Lv. {MinLevel}-{MaxLevel}"; + return $"{species}{form}{sex} Lv. {MinLevel}-{MaxLevel} {Weather}"; } public bool Absorb(PaldeaEncounter other) @@ -112,9 +112,9 @@ public int CompareTo(PaldeaEncounter? other) return CrossFromLocation.CompareTo(other.CrossFromLocation); } - public ulong GetHash() + public UInt128 GetHash() { - ulong result = Species; + UInt128 result = Species; result = (result << 16) | CrossFromLocation; result = (result << 8) | Form; diff --git a/pkNX.WinForms/Dumping/SV/Location/LocationStorage.cs b/pkNX.WinForms/Dumping/SV/Location/LocationStorage.cs index cb102c37..6c87543f 100644 --- a/pkNX.WinForms/Dumping/SV/Location/LocationStorage.cs +++ b/pkNX.WinForms/Dumping/SV/Location/LocationStorage.cs @@ -10,7 +10,7 @@ public class LocationStorage(int loc, PaldeaFieldIndex fieldIndex, string areaNa public readonly AreaInfo AreaInfo = info; public readonly string AreaName = areaName; - public readonly HashSet Added = []; + public readonly HashSet Added = []; public readonly List Slots = []; public readonly Dictionary SlotsCrossover = []; public readonly List Local = []; @@ -143,6 +143,7 @@ public void GetEncounters(EncountPokeDataArray pokeData, PaldeaSceneModel scene) { foreach (var spawner in Local) { + var boost = spawner.LevelAdjust; foreach (var pd in pokeData.Table) { if (!IsAbleToSpawnAt(pd, spawner, AreaName, scene, fieldIndex)) @@ -154,7 +155,6 @@ public void GetEncounters(EncountPokeDataArray pokeData, PaldeaSceneModel scene) if (pd.BandPoke != 0) // Add band encount spawner.Add(PaldeaEncounter.GetBand(pd, point)); - var boost = spawner.LevelAdjust; if (boost == 0) continue;