DisplayType -> LotteryGroup

LegoFigure11 · Sep 24, 2023 · 4a4d218 · 4a4d218
1 parent 24a443c
commit 4a4d218
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/RaidCrawler.Core/Structures/Raid.cs b/RaidCrawler.Core/Structures/Raid.cs
@@ -23,7 +23,7 @@ public Raid(
         public bool IsValid => Validate();
         public bool IsActive => ReadUInt32LittleEndian(Data.AsSpan(0x00)) == 1;
         public uint Area => ReadUInt32LittleEndian(Data.AsSpan(0x04));
-        public uint DisplayType => ReadUInt32LittleEndian(Data.AsSpan(0x08));
+        public uint LotteryGroup => ReadUInt32LittleEndian(Data.AsSpan(0x08));
         public uint Den => ReadUInt32LittleEndian(Data.AsSpan(0x0C));
         public uint Seed => ReadUInt32LittleEndian(Data.AsSpan(0x10));
         public uint Flags => ReadUInt32LittleEndian(Data.AsSpan(0x18));
@@ -43,7 +43,12 @@ public Raid(
 
         private bool Validate()
         {
-            if (Seed == 0 || !IsActive || Area > 22)
+            if (
+                Seed == 0
+                || !IsActive
+                || (MapParent == TeraRaidMapParent.Paldea && Area > 22)
+                || (MapParent == TeraRaidMapParent.Kitakami && Area > 11)
+            )
                 return false;
 
             GenerateGenericRaidData(Seed);

diff --git a/RaidCrawler.WinForms/MainWindow.cs b/RaidCrawler.WinForms/MainWindow.cs
@@ -1620,11 +1620,8 @@ DenLocationsBase is null
                 x =
                     (
                         (
-                            (
-                                raid.MapParent == TeraRaidMapParent.Paldea
-                                    ? 1
-                                    : 2.766970605475146
-                            ) * locData[$"{raid.Area}-{raid.DisplayType}-{raid.Den}"][0]
+                            (raid.MapParent == TeraRaidMapParent.Paldea ? 1 : 2.766970605475146)
+                            * locData[$"{raid.Area}-{raid.LotteryGroup}-{raid.Den}"][0]
                         )
                         + (
                             raid.MapParent == TeraRaidMapParent.Paldea
@@ -1637,11 +1634,8 @@ DenLocationsBase is null
                 y =
                     (
                         (
-                            (
-                                raid.MapParent == TeraRaidMapParent.Paldea
-                                    ? 1
-                                    : 2.5700782642623805
-                            ) * locData[$"{raid.Area}-{raid.DisplayType}-{raid.Den}"][2]
+                            (raid.MapParent == TeraRaidMapParent.Paldea ? 1 : 2.5700782642623805)
+                            * locData[$"{raid.Area}-{raid.LotteryGroup}-{raid.Den}"][2]
                         )
                         + (
                             raid.MapParent == TeraRaidMapParent.Paldea